Commit graph

9101 commits

Author SHA1 Message Date
Marc Alexander
06be2ff67d Merge branch 'develop-ascraeus' into develop 2014-08-10 18:07:11 +02:00
Marc Alexander
bc9b813ce7 Merge pull request #2864 from rxu/ticket/12931
[ticket/12931] Fix general error on user registration
2014-08-10 18:06:55 +02:00
rxu
838d4dc2c6 [ticket/12931] Fix general error on user registration
Fix "Illegal use of $_SERVER" general error on user registration
when $config['server_name'] is not set.

PHPBB3-12931
2014-08-10 21:31:08 +08:00
Joas Schilling
d998efcf54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
2014-08-10 15:24:43 +02:00
Joas Schilling
54b0ebc410 Merge pull request #2862 from marc1706/ticket/12932
[ticket/12932] Add method for allowing override of \phpbb\datetime class

* marc1706/ticket/12932:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding
2014-08-10 15:23:15 +02:00
Dhruv
58a863dbad Merge branch 'develop-ascraeus' into develop
# By omniError
# Via Dhruv Goel (1) and omniError (1)
* develop-ascraeus:
  [ticket/12831] fix CS
  [ticket/12831] simplified code, upd event block
  [ticket/12831] reimplemented headers as array
  [ticket/12831] Optn to prevent setting HTTP headers
2014-08-10 15:06:45 +02:00
Dhruv Goel
472fe9fe60 Merge pull request #2730 from omniError/ticket/12831
[ticket/12831] Allow events in page_header functions to prevent the setting of HTTP headers
2014-08-10 15:05:28 +02:00
Marc Alexander
8d99b4afe1 [ticket/12932] Fix tests and calls to create_datetime
PHPBB3-12932
2014-08-10 13:43:04 +02:00
Marc Alexander
a57a96cbdd [ticket/12932] Add method for getting the datetime class and allow overriding
An extension can now override the datetime class by overwriting the
datetime.class parameter in their own yml file.

PHPBB3-12932
2014-08-10 13:41:08 +02:00
Joas Schilling
9572cc0ccc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12943] Add core.phpbb_generate_debug_output core event
2014-08-10 13:23:15 +02:00
Joas Schilling
707568c496 Merge pull request #2846 from rxu/ticket/12943
[ticket/12943] Add core.phpbb_generate_debug_output core event

* rxu/ticket/12943:
  [ticket/12943] Add core.phpbb_generate_debug_output core event
2014-08-10 13:19:56 +02:00
Joas Schilling
9e0c234979 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
2014-08-10 12:22:35 +02:00
Joas Schilling
1f6b9628e7 Merge pull request #2852 from bantu/ticket/12938
[ticket/12938] Remove the 'Download all attachments' feature.

* bantu/ticket/12938:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
2014-08-10 12:22:22 +02:00
Tristan Darricau
e7e6d45789 [ticket/12957] Update the constructions of the template engine
PHPBB3-12957
2014-08-10 03:32:27 +02:00
omniError
71d39ab7d5 [ticket/12831] fix CS
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
2014-08-09 20:24:03 -05:00
omniError
7e4c3fde01 [ticket/12831] simplified code, upd event block
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
2014-08-09 18:48:26 -05:00
Tristan Darricau
59b5ab4866 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
2014-08-10 01:02:38 +02:00
Tristan Darricau
b000d10ef8 Merge pull request #2849 from bantu/ticket/12941
[ticket/12941] Check for Sami parse errors on Travis CI.

* bantu/ticket/12941:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
2014-08-10 01:02:27 +02:00
omniError
8989f6f878 [ticket/12831] reimplemented headers as array
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
2014-08-09 14:40:18 -05:00
Andreas Fischer
076d4ddd7f [ticket/12941] Fix remaining Sami complaints.
PHPBB3-12941
2014-08-09 18:08:49 +02:00
Tristan Darricau
04c084ead8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
2014-08-09 17:50:54 +02:00
Tristan Darricau
86f94f922c Merge pull request #2624 from dhruvgoel92/ticket/12718
[ticket/12718] Use remove_topic_from_statistic() for delete_topic

* dhruvgoel92/ticket/12718:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
2014-08-09 17:33:44 +02:00
rxu
917cd4dec7 [ticket/12943] Add core.phpbb_generate_debug_output core event
Add core.phpbb_generate_debug_output core event to allow extensions
outputting additional debug info.

PHPBB3-12943
2014-08-09 23:02:36 +08:00
Andreas Fischer
12caf2f03d [ticket/12938] Remove the 'Download all attachments' feature.
PHPBB3-12938
2014-08-09 16:33:59 +02:00
Marc Alexander
4840584cd6 Merge branch 'develop-ascraeus' into develop 2014-08-09 13:06:01 +02:00
Marc Alexander
20b8ea947c Merge pull request #2833 from Geolim4/ticket/11520
[ticket/11520] Re-adjust userpost count on topic fork
2014-08-09 13:00:34 +02:00
Joas Schilling
d497104671 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
2014-08-09 11:44:18 +02:00
Joas Schilling
7a016572bd Merge pull request #2724 from VSEphpbb/ticket/12841
[ticket/12841] Allow extensions to position new config vars

* VSEphpbb/ticket/12841:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
2014-08-09 11:43:56 +02:00
Geolim4
3825aee130 [ticket/11520] Re-adjust userpost count on topic fork
PHPBB3-11520
2014-08-08 17:07:29 +02:00
Geolim4
af67bd3ea5 [ticket/11520] Coding guideline compliance
PHPBB3-11520
2014-08-08 17:07:16 +02:00
Geolim4
fc1e420a7c [ticket/11520] Re-adjust userpost count on topic fork
PHPBB3-11520
2014-08-08 17:05:40 +02:00
Andreas Fischer
eeb80d2ec5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
2014-08-08 16:03:25 +02:00
Andreas Fischer
42c26cd781 Merge pull request #2832 from marc1706/ticket/10404
[ticket/10404] Use anonymous function instead of create_function in acp/auth

* marc1706/ticket/10404:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
2014-08-08 16:03:24 +02:00
Joas Schilling
55c21834ad Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:55 +02:00
Joas Schilling
96e9d728b9 Merge pull request #2824 from brunoais/ticket/12927
[ticket/12927] core.mcp_queue_get_posts2_query_before

* brunoais/ticket/12927:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:35 +02:00
Joas Schilling
4e66d7bdd9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
2014-08-08 14:36:10 +02:00
Joas Schilling
53247573c2 Merge pull request #2764 from brunoais/ticket/12880
[ticket/12880] core.mcp_queue_!is_topics_query_before

* brunoais/ticket/12880:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
2014-08-08 14:35:53 +02:00
Joas Schilling
b7f4d98cf2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
2014-08-08 14:33:11 +02:00
Joas Schilling
bef9d64179 Merge pull request #2762 from brunoais/ticket/12876
[ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after

* brunoais/ticket/12876:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
2014-08-08 14:32:55 +02:00
Marc Alexander
27f769e461 [ticket/10404] Fix codesniffer complaint about anonymous function
PHPBB3-10404
2014-08-08 14:01:04 +02:00
Marc Alexander
c5d72c94f1 [ticket/10404] Use anonymous function instead of create_function in acp/auth
PHPBB3-10404
2014-08-08 12:19:36 +02:00
brunoais
0679f76287 [ticket/12927] core.mcp_queue_get_posts2_query_before
Adding the core.mcp_queue_get_posts2_query_before
event to mcp backend.

PHPBB3-12927
2014-08-08 10:52:08 +01:00
brunoais
1f5f2327e8 [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
Adding the core.mcp_mcp_front.mcp_front_view_queue_topicid_list_after
event to mcp backend.

PHPBB3-12876
2014-08-07 18:37:07 +01:00
brunoais
50cc81afa3 [ticket/12880] core.mcp_queue_!is_topics_query_before
Adding core.mcp_queue_is_topics_query_before

PHPBB3-12880
2014-08-07 18:33:37 +01:00
Marc Alexander
bfae68583a Merge branch 'develop-ascraeus' into develop 2014-08-07 17:36:52 +02:00
Marc Alexander
a8dee3fb65 Merge pull request #2810 from nickvergessen/ticket/12919
[ticket/12919] Use the modules basename as identifier for extension modules
2014-08-07 17:36:19 +02:00
Dhruv
17e360225d [ticket/12718] Use remove_topic_from_statistic() for delete_topic
PHPBB3-12718
2014-08-07 17:19:14 +02:00
Tristan Darricau
8f1be5e741 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
2014-08-07 16:46:31 +02:00
Tristan Darricau
ab8a197e92 Merge pull request #2623 from dhruvgoel92/ticket/12738
[ticket/12738] Move related code from functions_posting to function

* dhruvgoel92/ticket/12738:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
2014-08-07 16:44:49 +02:00
Joas Schilling
9925733350 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
2014-08-07 16:24:48 +02:00