Commit graph

10537 commits

Author SHA1 Message Date
Marc Alexander
3df25babce [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
PHPBB3-13597
2015-02-11 12:03:54 +01:00
rxu
67a963ac42 [ticket/13596] Add display_forums() event to allow modifying forums list data
Add display_forums() core event in includes/functions_display.php to allow
modifying forums list data before the list is being generated and dumped
to the template.

PHPBB3-13596
2015-02-10 10:05:44 +07:00
Marc Alexander
c76d797cb2 [ticket/9109] Improve docblock and fix spelling errors
PHPBB3-9109
2015-02-08 21:16:05 +01:00
Marc Alexander
5cc0488f74 [ticket/9109] Only query database once in phpbb_get_max_setting_from_group
More test cases have been added, too.

PHPBB3-9109
2015-02-08 21:16:05 +01:00
Joas Schilling
291143fe6a [ticket/9109] Properly document and calculate the group settings with value 0
PHPBB3-9109
2015-02-08 21:16:04 +01:00
rxu
072df2217c [ticket/13591] Add core events to the function obtain_users_online_string()
Add functions.php core events to the function obtain_users_online_string()
to allow extensions adding/modifying online users data.

PHPBB3-13591
2015-02-08 12:28:28 +07:00
Joas Schilling
37ae99c75d [ticket/10748] Replace direct creations of tools();
PHPBB3-10748
2015-02-07 14:41:39 +01:00
Marc Alexander
cd85f1b632 Merge branch 'ticket/13568' into ticket/13568-asc
Conflicts:
	phpBB/adm/index.php
	phpBB/includes/acp/acp_attachments.php
2015-02-06 10:19:39 +01:00
Gaëtan Muller
52446c8327 [ticket/13455] Remove request_var() references from comments
PHPBB3-13455
2015-02-03 20:56:48 +01:00
Gaëtan Muller
abcb2680ee [ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Andreas Fischer
284aa8c496 Merge pull request #3281 from MGaetan89/ticket/13496
[ticket/13496] Change set_config_count() calls with $config->increment()

* MGaetan89/ticket/13496:
  [ticket/13496] Update calls to `set_config_count()`
2015-02-03 18:13:20 +01:00
Andreas Fischer
63d863a883 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
2015-02-03 17:38:02 +01:00
Andreas Fischer
2864e77d6c Merge pull request #3361 from marc1706/ticket/13569
[ticket/13569] Add missing sql_freeresults and remove unneeded results

* marc1706/ticket/13569:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
2015-02-03 17:38:00 +01:00
Joas Schilling
529820b620 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:30:15 +01:00
Joas Schilling
bbb6d6a452 Merge pull request #3330 from kasimi/ticket/13540
[ticket/13540] Add core event for modifying topic review block data
2015-02-02 23:30:06 +01:00
Joas Schilling
677ff632c4 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/includes/mcp/mcp_queue.php
2015-02-02 23:27:19 +01:00
Joas Schilling
efee422707 Merge pull request #3326 from Wolfsblvt-Test/ticket/13537
Add core events on mcp_queue for approval and disapproval
2015-02-02 23:25:53 +01:00
Joas Schilling
917a5ce0df Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
2015-02-02 23:23:26 +01:00
Joas Schilling
7330c0afd3 Merge pull request #3325 from rxu/ticket/13536
[ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
2015-02-02 23:22:23 +01:00
Joas Schilling
7e7b337d27 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:19:49 +01:00
Joas Schilling
6678570f49 Merge pull request #3324 from rxu/ticket/13336
[ticket/13336] Add core events to the function user_active_flip()
2015-02-02 23:19:44 +01:00
Joas Schilling
2f060b8299 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:18:24 +01:00
Joas Schilling
e9eafece3f Merge pull request #3323 from rxu/ticket/13535
[ticket/13535] Add core event to allow modifying account settings on editing
2015-02-02 23:18:15 +01:00
Joas Schilling
eadacaa3ad Merge branch 'develop-ascraeus' into develop 2015-02-02 23:12:47 +01:00
Joas Schilling
0e6cd94fb4 Merge pull request #3317 from Wolfsblvt/ticket/13532
Add core event to get_unread_topics() in functions.php
2015-02-02 23:12:42 +01:00
Joas Schilling
517549eae6 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:09:41 +01:00
Joas Schilling
0aea283ab0 Merge pull request #3305 from Wolfsblvt/ticket/13518
Add core event to markread() in functions.php
2015-02-02 23:09:34 +01:00
Joas Schilling
f31d12ddf2 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:00:48 +01:00
Joas Schilling
7254a52812 Merge pull request #3282 from Elsensee/ticket/13313
[ticket/13313] Add event core.acp_email_display
2015-02-02 23:00:29 +01:00
Gaëtan Muller
a633f3484c [ticket/13496] Update calls to set_config_count()
PHPBB3-13496
2015-02-02 21:52:59 +01:00
Marc Alexander
8569e1c77a Merge branch 'develop-ascraeus' into develop 2015-02-02 21:06:02 +01:00
Marc Alexander
5182d02da5 Merge pull request #3334 from paul999/ticket/13542
[ticket/13542] Update core.ucp_prefs_personal_data to include $error
2015-02-02 21:05:44 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config()
PHPBB3-13494
2015-02-02 19:28:23 +01:00
Marc Alexander
a93df0e511 [ticket/13568] Use more descriptive validation names and merge with path block
PHPBB3-13568
2015-02-02 18:30:05 +01:00
Marc Alexander
a166f6f42c [ticket/13569] Add missing sql_freeresults and remove unneeded results
PHPBB3-13569
2015-02-02 17:36:39 +01:00
Marc Alexander
19421fcdef [ticket/13568] Validate imagick path as readable absolute path
PHPBB3-13568
2015-02-02 15:59:52 +01:00
Joas Schilling
3c23242bfe Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-31 12:11:43 +01:00
Joas Schilling
dd182c5433 [prep-release-3.1.3] Update version to 3.1.3-RC2 2015-01-31 01:03:55 +01:00
Dhruv
ab07be8157 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-30 13:10:38 +05:30
Andreas Fischer
6f5524de26 Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
2015-01-29 00:08:23 +01:00
Andreas Fischer
872caf805c Merge pull request #3348 from bantu/ticket/13549
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME...

* bantu/ticket/13549:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
2015-01-29 00:06:00 +01:00
Andreas Fischer
f48cc8bbe9 Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
  [ticket/12933] Handle case when * is last character of word
2015-01-29 00:03:16 +01:00
Marc Alexander
7495055907 [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
The ORIG_PATH_INFO on IIS also contains the script name. Only use that
for killing the script after removing the script name from ORIG_PATH_INFO.

PHPBB3-13549
2015-01-28 22:07:16 +01:00
Dhruv
5eb0d422c8 [ticket/12933] Handle case when * is last character of word
PHPBB3-12933
2015-01-28 21:59:58 +01:00
Andreas Fischer
91ff42d501 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13414] Set Content-Length header only if status is not 304
2015-01-28 19:57:29 +01:00
Andreas Fischer
e3e427fa24 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13414] Set Content-Length header only if status is not 304

Conflicts:
	phpBB/download/file.php
2015-01-28 19:56:47 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log()
PHPBB3-13468
2015-01-27 18:34:33 +01:00
Joas Schilling
acfb9b9539 [prep-release-3.1.3] Update version to 3.1.2-RC1 2015-01-26 19:42:06 +01:00
Nils Adermann
5ce89ae82f [prep-release-3.0.13] Bump version numbers for 3.0.13 release 2015-01-26 18:08:31 +01:00