Andreas Fischer
069738a1f2
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7
2015-02-11 16:53:25 +01:00
Andreas Fischer
39a3f4f6c8
Merge pull request #3391 from marc1706/ticket/13597
...
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7
* marc1706/ticket/13597:
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7
2015-02-11 16:53:25 +01:00
Marc Alexander
3df25babce
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7
...
PHPBB3-13597
2015-02-11 12:03:54 +01:00
Nicofuma
acf3744297
Merge pull request #3332 from nickvergessen/ticket/10748-mssql
...
[ticket/10748] Split MS SQL from the db tools file into it's own
2015-02-09 17:11:09 +01:00
Joas Schilling
74d1b1812f
[ticket/10748] Overwrite the type map correctly
...
PHPBB3-10748
2015-02-07 14:41:40 +01:00
Joas Schilling
37ae99c75d
[ticket/10748] Replace direct creations of tools();
...
PHPBB3-10748
2015-02-07 14:41:39 +01:00
Joas Schilling
4ea90ca44d
[ticket/10748] Split MS SQL from the db tools file into it's own
...
PHPBB3-10748
2015-02-07 14:36:26 +01:00
Joas Schilling
b0c910e49c
Merge branch 'develop-ascraeus' into develop
2015-02-07 14:33:37 +01:00
Joas Schilling
c6a371531b
Merge pull request #3379 from Crizz0/ticket/13588
...
[ticket/13588] Fixes wrong message in info fsockopen() disabled
2015-02-07 14:33:34 +01:00
Crizzo
fbc603861d
[ticket/13588] Fixes wrong message in info fsockopen() disabled
...
PHPBB3-13588
2015-02-07 13:50:08 +01:00
Andreas Fischer
e4064ca839
Merge pull request #3207 from Nicofuma/ticket/13407
...
[ticket/13407] Update Symfony to 2.7.*@dev
* Nicofuma/ticket/13407:
[ticket/13407] Update composer.lock file
[ticket/13407] Bump minimal version to php 5.3.9
[ticket/13407] Introduce a request_stack service
[ticket/13407] Remove the last occurence of pattern in routing files
[ticket/13407] Update Symfony to 2.7.*@dev
2015-02-04 21:14:01 +01:00
Andreas Fischer
3267c6a61a
Merge pull request #3257 from MGaetan89/ticket/13455
...
[ticket/13455] Change request_var() calls with $request->variable()
* MGaetan89/ticket/13455:
[ticket/13455] Remove `request_var()` references from comments
[ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`
[ticket/13455] Update calls to `request_var()`
2015-02-04 21:09:54 +01:00
Nicofuma
e323c7c23a
[ticket/13407] Update composer.lock file
...
PHPBB3-13407
2015-02-04 17:48:10 +01:00
Nicofuma
b8939da242
[ticket/13407] Bump minimal version to php 5.3.9
...
PHPBB3-13407
2015-02-04 17:40:18 +01:00
Nicofuma
73d3d02af1
[ticket/13407] Introduce a request_stack service
...
PHPBB3-13407
2015-02-04 17:40:14 +01:00
Nicofuma
216fb13c2a
[ticket/13407] Remove the last occurence of pattern in routing files
...
PHPBB3-13407
2015-02-04 17:40:11 +01:00
Nicofuma
9e104b0915
[ticket/13407] Update Symfony to 2.7.*@dev
...
PHPBB3-13407
2015-02-04 17:40:06 +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
f9ab676530
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle
2015-02-03 20:36:53 +01:00
Andreas Fischer
1e4853507a
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
2015-02-03 20:36:46 +01:00
Andreas Fischer
8832851b8e
Merge pull request #3366 from marc1706/ticket/13348
...
[ticket/13348] Use close method to free feed query result handle
* marc1706/ticket/13348:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle
2015-02-03 20:36:41 +01:00
Andreas Fischer
2787e799e1
Merge pull request #3365 from marc1706/ticket/13348-olympus
...
[ticket/13348] Use close method to free query result handle
* marc1706/ticket/13348-olympus:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle
2015-02-03 20:36:27 +01:00
Marc Alexander
a09d022d5e
Merge branch 'ticket/13348-olympus' into ticket/13348
...
Conflicts:
phpBB/feed.php
2015-02-03 18:30:45 +01:00
Marc Alexander
4e06ab16f0
[ticket/13348] Remove unnecessary global $cache
...
$cache is not used in the method get_item().
PHPBB3-13348
2015-02-03 18:24:16 +01:00
Marc Alexander
1f2cb69c8a
[ticket/13348] Use close method to free query result handle
...
PHPBB3-13348
2015-02-03 18:23:13 +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
3fb6d5b838
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13538] Add tests for double nested pagination loop
[ticket/13538] Fix tests for pagination in nested loop
[ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:47 +01:00
Andreas Fischer
5347eac69c
Merge pull request #3328 from marc1706/ticket/13538
...
[ticket/13538] Add tests for pagination in nested loops
* marc1706/ticket/13538:
[ticket/13538] Add tests for double nested pagination loop
[ticket/13538] Fix tests for pagination in nested loop
[ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:46 +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
Andreas Fischer
ceaba8aaf9
Merge pull request #3028 from Nicofuma/ticket/13139
...
[ticket/13139] Update Twig to 1.18.0
* Nicofuma/ticket/13139:
[ticket/13139] Fix tests
[ticket/13139] Update Twig to 1.8.0
[ticket/13139] Update Twig to 1.16.2
2015-02-03 15:08:36 +01:00
Nicofuma
f4b42c961f
[ticket/13139] Fix tests
...
PHPBB3-13139
2015-02-03 13:37:52 +01:00
Nicofuma
199e7cf5a1
[ticket/13139] Update Twig to 1.8.0
...
PHPBB3-13139
2015-02-03 13:34:59 +01:00
Tristan Darricau
e1f983d3cf
[ticket/13139] Update Twig to 1.16.2
...
PHPBB3-13139
2015-02-03 13:34:53 +01:00
Andreas Fischer
427d2de3ea
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:03 +01:00
Andreas Fischer
7e91320995
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:03 +01:00
Andreas Fischer
e86b7ce562
Merge pull request #3363 from Nicofuma/ticket/13572
...
[ticket/13572] Update composer to version 1.0.0-alpha9
* Nicofuma/ticket/13572:
[ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:02 +01:00
Nicofuma
f4f983c0f6
[ticket/13572] Update composer to version 1.0.0-alpha9
...
PHPBB3-13572
2015-02-03 10:25:39 +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
