aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-12-071-0/+2
|\ | | | | | | | | | | * 3.1.x: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()
| * [ticket/14261] Move the update of session informations to page_footer()Zoddo2015-10-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Currently, the unique way to disable the update of session_page is to pass "false" to the parameter of session_begin(). This method is directly called in app.php, so pages served from the routing system can't disable the update of session informations. By moving the update to page_footer, we can allow controllers to tell to the session manager that we don't want to update the session infos. PHPBB3-14261
* | Merge branch '3.1.x'Cesar G2015-10-221-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14249] Fix online list order
| * [ticket/14249] Fix online list orderOliver Schramm2015-10-211-1/+1
| | | | | | | | PHPBB3-14249
* | Merge branch '3.1.x'Tristan Darricau2015-10-121-7/+12
|\ \ | |/ | | | | | | * 3.1.x: [ticket/13591] Change SQL query into array to allow
| * Merge pull request #3946 from RMcGirr83/ticket_13591Tristan Darricau2015-10-121-7/+12
| |\ | | | | | | | | | | | | | | | | | | [ticket/13591] Change SQL query into array to allow * RMcGirr83/ticket_13591: [ticket/13591] Change SQL query into array to allow
| | * [ticket/13591] Change SQL query into array to allowRMcGirr832015-10-081-7/+12
| | | | | | | | | | | | | | | | | | extension authors to modify SQL query PHPBB3-13591
* | | Merge branch '3.1.x'Tristan Darricau2015-10-121-1/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14200] Allow hidden users to see himself on viewonline
| * | [ticket/14200] Allow hidden users to see himself on viewonlineZoddo2015-10-101-1/+1
| |/ | | | | | | PHPBB3-14200
* | [ticket/12769] Properly include FAMichael Miday2015-09-171-1/+2
| |
* | Merge pull request #3876 from VSEphpbb/ticket/14138Tristan Darricau2015-09-091-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/14138] Use span tags instead of abbr * VSEphpbb/ticket/14138: [ticket/14138] Use span tags instead of abbr
| * | [ticket/14138] Use span tags instead of abbrMatt Friedman2015-09-011-2/+2
| | | | | | | | | | | | PHPBB3-14138
* | | Merge branch '3.1.x'Marc Alexander2015-09-081-1/+1
|\ \ \ | |/ / |/| / | |/
| * [ticket/14142] Remove unused ignore_configs from avatar driversMatt Friedman2015-09-041-1/+1
| | | | | | | | PHPBB3-14142
* | Merge branch '3.1.x'Tristan Darricau2015-08-281-1/+1
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14070] Properly pass whether config should be ignored for avatars
| * Merge pull request #3809 from marc1706/ticket/14070Tristan Darricau2015-08-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | [ticket/14070] Properly pass whether config should be ignored for avatars * marc1706/ticket/14070: [ticket/14070] Properly pass whether config should be ignored for avatars
| | * [ticket/14070] Properly pass whether config should be ignored for avatarsMarc Alexander2015-08-051-1/+1
| | | | | | | | | | | | PHPBB3-14070
* | | Merge pull request #3470 from Nicofuma/ticket/13645Máté Bartus2015-08-281-1/+1
|\ \ \ | | | | | | | | [ticket/13645] Move the feeds to controllers
| * | | [ticket/13645] Move the feeds to controllersNicofuma2015-08-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13645
* | | | [ticket/13897] Make dependency to the filesystem optional in error handlerTristan Darricau2015-08-251-1/+9
|/ / / | | | | | | | | | PHPBB3-13897
* | | Merge branch '3.1.x'Marc Alexander2015-08-091-1/+15
|\ \ \ | |/ /
| * | Merge pull request #3784 from Senky/ticket/14043Marc Alexander2015-08-091-1/+15
| |\ \ | | |/ | |/| | | | [ticket/14043] Add core.get_avatar_after php event
| | * [ticket/14043] Add more parameters to the eventJakub Senko2015-08-021-2/+6
| | | | | | | | | | | | PHPBB3-14043
| | * [ticket/14043] Add dispatcher to globals, change @since valueJakub Senko2015-07-221-2/+2
| | | | | | | | | | | | PHPBB3-14043
| | * [ticket/14043] Add core.get_avatar_after php eventJakub Senko2015-07-211-1/+11
| | | | | | | | | | | | PHPBB3-14043
* | | [ticket/11444] Moving the in-board notifications to a method classNicofuma2015-07-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the in-board method for the notifications is hardcoded and cannot be disabled. This method should be in his own class extending `phpbb\notification\method\method_interface`. It also add the possibility, for each method, to be enabled by default (ie: no entry in the DB => notification enabled). https://tracker.phpbb.com/browse/PHPBB3-11444 https://tracker.phpbb.com/browse/PHPBB3-11967 PHPBB3-11444
* | | Merge pull request #3747 from rxu/ticket/13377Tristan Darricau2015-07-131-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/13377] Fix decoding for www type URLs in function decode_message()
| * | | [ticket/13377] Fix decoding for www type URLs in function decode_message()rxu2015-07-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13377
* | | | Merge branch '3.1.x'Marc Alexander2015-07-081-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: tests/template/template_includecss_test.php
| * | [ticket/13995] Invalid avatar HTML missing space between elementsMatt Friedman2015-07-071-1/+1
| | | | | | | | | | | | PHPBB3-13995
* | | Merge branch '3.1.x'Marc Alexander2015-06-171-4/+6
|\ \ \ | |/ /
| * | [ticket/13882] Add lazy load avatars to phpbb wrappersMatt Friedman2015-06-161-4/+6
| | | | | | | | | | | | PHPBB3-13882
* | | Merge branch '3.1.x'Marc Alexander2015-06-161-2/+24
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/phpbb/user_loader.php
| * | Merge pull request #3653 from callumacrae/ticket/13882Marc Alexander2015-06-161-2/+24
| |\ \ | | | | | | | | | | | | [ticket/13882] Lazy load the notification avatars.
| | * | [ticket/13882] no more egyptian brackets /o/Callum Macrae2015-05-301-2/+5
| | | | | | | | | | | | | | | | PHPBB3-13882
| | * | [ticket/13882] Lazy load the notification avatars.Callum Macrae2015-05-281-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves them further down the waterfall, making the page load quicker. PHPBB3-13882
* | | | Merge branch '3.1.x'Andreas Fischer2015-06-131-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/10711] Duplicate key error on forum_tracks_table
| * | | Merge pull request #3703 from javiexin/ticket/10711Andreas Fischer2015-06-131-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10711] Duplicate key error on forum_tracks_table * javiexin/ticket/10711: [ticket/10711] Duplicate key error on forum_tracks_table
| | * | | [ticket/10711] Duplicate key error on forum_tracks_tablejaviexin2015-06-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY' in the forums_track table is produced when marking forums read (viewforum.php?f=xx&mark=forums). The problem happens when there are duplicates in the forum_id array. The solution is to remove those duplicates. PHPBB3-10711
| * | | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-301-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | [ticket/13790] Update phpcs
| | * | | [ticket/13790] Update phpcsTristan Darricau2015-05-191-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-13790
* | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Ticket/13844 Better FAQ language files
| * | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13844
* | | | | [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()JoshyPHP2015-05-111-33/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code. PHPBB3-13614
* | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-021-176/+4
| | | | | | | | | | | | | | | | PHPBB3-13762
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-281-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| * | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.4: [ticket/security-180] Use language variable for redirect error in 3.1+ [ticket/security-180] Merge if statement with previous one in 3.1.x [ticket/security-180] Add tests for redirecting to main URL [ticket/security-180] Always fail when redirecting to an insecure URL [ticket/security-180] Make sure that redirect goes to full URL plus slash [ticket/security-180] Check if redirect URL contains board URL
| | * | | [ticket/security-180] Use language variable for redirect error in 3.1+Marc Alexander2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | SECURITY-180
| | * | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | | * | | [ticket/security-180] Always fail when redirecting to an insecure URLJoas Schilling2015-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180