aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | * | | | [ticket/security-180] Merge if statement with previous one in 3.1.xMarc Alexander2015-04-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | * | | | Merge branch 'ticket/security-180' into ticket/security-180-ascMarc Alexander2015-04-281-0/+6
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | Conflicts: tests/security/redirect_test.php
| | | * | | [ticket/security-180] Make sure that redirect goes to full URL plus slashMarc Alexander2015-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
| | | * | | [ticket/security-180] Check if redirect URL contains board URLMarc Alexander2015-04-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-180
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-04-271-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
| * | | | | [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserverAlexander Köplinger2015-04-261-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was added as a workaround for bugs in very old versions of IIS, dating back to 2002: see commit 849d76697444f4e3523845f8c96569ccde57d868. Newer IIS versions handle the 'Location' header just fine, so we can avoid the unnecessary HTML page for redirects. Given that it seems to work fine since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special check for earlier versions as they are no longer supported by MS as well. PHPBB3-12101
* | | | | Merge branch '3.1.x'Andreas Fischer2015-04-251-2/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
| * | | | Merge branch 'ticket/13765' into ticket/13765-3.1.4Andreas Fischer2015-04-251-2/+8
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13765: [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. Conflicts: phpBB/includes/functions.php phpBB/includes/startup.php
| | * | | [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.Joas Schilling2015-04-251-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-13765
* | | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-161-444/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697
* | | | Merge branch '3.1.x'Nicofuma2015-03-241-13/+11
|\ \ \ \ | |/ / /
| * | | [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.Cesar G2015-03-231-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid while hitting the LOGIN_ERROR_ATTEMPTS error. PHPBB3-13698
* | | | Merge pull request #3434 from nickvergessen/ticket/13647Marc Alexander2015-03-051-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13647] Move FAQ page to a controller
| * | | | [ticket/13647] Generate route links for faqJoas Schilling2015-02-221-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13647
* | | | | Merge branch '3.1.x'Joas Schilling2015-02-241-6/+52
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #3381 from rxu/ticket/13591Joas Schilling2015-02-241-6/+52
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/13591] Add core events to the function obtain_users_online_string()
| | * | [ticket/13591] Add core events to the function obtain_users_online_string()rxu2015-02-081-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add functions.php core events to the function obtain_users_online_string() to allow extensions adding/modifying online users data. PHPBB3-13591
* | | | Merge branch '3.1.x'Marc Alexander2015-02-181-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/13433] Fix parsing of email addressesrxu2015-02-171-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Currently email addresses are parsed incorrectly due to the regex structure. Namely, if localpart consists of several dot separated parts, only the last part with the trailing dot will be captured. The patch change this behavior to capture the whole localpart. PHPBB3-13433
* | | [ticket/13455] Update calls to `request_var()`Gaëtan Muller2015-02-031-77/+11
| | | | | | | | | | | | PHPBB3-13455
* | | Merge pull request #3281 from MGaetan89/ticket/13496Andreas Fischer2015-02-031-30/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13496] Change set_config_count() calls with $config->increment() * MGaetan89/ticket/13496: [ticket/13496] Update calls to `set_config_count()`
| * | | [ticket/13496] Update calls to `set_config_count()`Gaëtan Muller2015-02-021-30/+0
| | | | | | | | | | | | | | | | PHPBB3-13496
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-021-0/+19
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3317 from Wolfsblvt/ticket/13532Joas Schilling2015-02-021-0/+19
| |\ \ \ | | | | | | | | | | | | | | | Add core event to get_unread_topics() in functions.php
| | * | | [ticket/13532] Add core event to get_unread_topics() in functions.phpWolfsblvt2015-01-231-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding core event core.get_unread_topics_modify_sql to to funtion get_unread_topics() in functions.php, so that you now are able to modify the sql query that retrieves the unread topics. PHPBB3-13532
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-021-1/+34
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge pull request #3305 from Wolfsblvt/ticket/13518Joas Schilling2015-02-021-1/+34
| |\ \ \ | | | | | | | | | | | | | | | Add core event to markread() in functions.php
| | * | | [ticket/13518] Add core event to markread() in functions.phpWolfsblvt2015-01-231-1/+34
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding core event core.markread_before to to funtion markread() in functions.php, so that you now are able to add additional stuff inside the markread process, for example notifications designed in extensions. PHPBB3-13518
* | | | [ticket/13494] Update calls to `set_config()`Gaëtan Muller2015-02-021-37/+4
| | | | | | | | | | | | | | | | PHPBB3-13494
* | | | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-271-55/+9
| | | | | | | | | | | | | | | | PHPBB3-13468