aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-281-5/+5
|\ | | | | | | | | * develop-ascraeus: [ticket/13414] Set Content-Length header only if status is not 304
| * Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-281-5/+5
| |\ | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13414] Set Content-Length header only if status is not 304 Conflicts: phpBB/download/file.php
| | * [develop-olympus] Increment version number to 3.0.14-dev.Andreas Fischer2015-01-211-1/+1
| | |
| | * [develop-olympus] Bump version numbers for 3.0.13-RC1 release.Andreas Fischer2015-01-211-1/+1
| | |
| | * [ticket/13531] Send 404 Not Found.Andreas Fischer2015-01-211-1/+15
| | | | | | | | | | | | PHPBB3-13531
| | * [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).Marc Alexander2015-01-211-0/+34
| | | | | | | | | | | | PHPBB3-13531
| | * Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-4/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13527] Escape information received from version server * bantu/ticket/13527: [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables.
| | | * [ticket/13527] Apply htmlspecialchars() to data from version server.Andreas Fischer2015-01-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13527
| | | * [ticket/13527] Remove two unused variables.Andreas Fischer2015-01-201-3/+0
| | | | | | | | | | | | | | | | PHPBB3-13527
| | * | Merge pull request #3311 from bantu/ticket/13526Andreas Fischer2015-01-201-1/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13526] Correctly validate the ucp_pm_options form key. * bantu/ticket/13526: [ticket/13526] Correctly validate the ucp_pm_options form key.
| | | * | [ticket/13526] Correctly validate the ucp_pm_options form key.Joas Schilling2015-01-201-1/+5
| | | |/ | | | | | | | | | | | | PHPBB3-13526
* | | | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-2741-290/+516
| | | | | | | | | | | | | | | | PHPBB3-13468
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-201-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13519] Correctly validate imagick path as path and not string
| * | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-201-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13519] Correctly validate imagick path as path and not string Conflicts: phpBB/includes/acp/acp_attachments.php
| | * | Merge pull request #3306 from marc1706/ticket/13519Andreas Fischer2015-01-201-1/+1
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | [ticket/13519] Correctly validate imagick path as path and not string * marc1706/ticket/13519: [ticket/13519] Correctly validate imagick path as path and not string
| | | * [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13519
| | * | Merge pull request #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
| | |\ \ | | | |/ | | |/| [ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
| | | * [ticket/10985] Add fix to properly inherit style during update processJakub Senko2014-09-231-0/+5
| | | | | | | | | | | | | | | | PHPBB3-10985
| | * | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11613
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-201-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #3226 from prototech/ticket/13420Joas Schilling2015-01-201-2/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
| | * | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.Cesar G2014-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13420
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-201-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3278 from rxu/ticket/13492Joas Schilling2015-01-201-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13492] Fix IDN support for custom BBCode URL tokens
| | * | | | [ticket/13492] Add the migration to update custom bbcodes with IDN regexpsrxu2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the $utf8 checking regexp removing the curly braces. PHPBB3-13492
| | * | | | [ticket/13492] Add IDN support for custom BBCode URL tokensrxu2015-01-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom BBCode URL tokens does not support IDN. Custom BBCodes added earlier than IDN has been applied are unaffected. PHPBB3-13492
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-191-23/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13192] Add test for app.php in external subfolder [ticket/13192] Use ltrim() instead of preg_replace() [ticket/13192] Order test cases consistently [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root [ticket/13192] Pass correct parameters and rename method to get_valid_page [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals [ticket/13192] Use get_valid_user_page method in build_url function [ticket/13192] Add method for generating valid user page links
| * | | | | Merge pull request #3055 from marc1706/ticket/13192Tristan Darricau2015-01-191-23/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13192] Add method for generating valid user page links based on mod_rewrite * marc1706/ticket/13192: [ticket/13192] Add test for app.php in external subfolder [ticket/13192] Use ltrim() instead of preg_replace() [ticket/13192] Order test cases consistently [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root [ticket/13192] Pass correct parameters and rename method to get_valid_page [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals [ticket/13192] Use get_valid_user_page method in build_url function [ticket/13192] Add method for generating valid user page links
| | * | | | [ticket/13192] Pass correct parameters and rename method to get_valid_pageMarc Alexander2014-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| | * | | | [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globalsMarc Alexander2014-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $request global existed twice and the $phpEx global is not being used in confirm_box(). PHPBB3-13192
| | * | | | [ticket/13192] Use get_valid_user_page method in build_url functionMarc Alexander2014-10-211-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13192
* | | | | | Merge pull request #3237 from MGaetan89/ticket/12487Tristan Darricau2015-01-165-89/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12487] Update PHP code * MGaetan89/ticket/12487: [ticket/12487] Update PHP code
| * | | | | | [ticket/12487] Update PHP codeGaëtan Muller2015-01-115-89/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12487
* | | | | | | [ticket/13499] Move `get_remote_file()` to `functions_compatibility.php`Gaëtan Muller2015-01-152-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13499
* | | | | | | [ticket/13450] Type-hint return value of $phpbb_container->get()Gaëtan Muller2015-01-1247-14/+163
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13450
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-102-9/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3189 from rxu/ticket/12926Joas Schilling2015-01-102-9/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12926] Support for IDN (IRI)
| | * | | | | [ticket/12926] Get rid of the $scheme and $inline vars, fix regex_idn.phprxu2015-01-101-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the $scheme and $inline vars, fix regex_idn.php to generate both common and inline mode regexes all at once. PHPBB3-12926
| | * | | | | [ticket/12926] Support for IDN (IRI)rxu2014-11-272-5/+5
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add international domain name support for URLs. PHPBB3-12926
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-1/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/bbcode.php
| * | | | | Merge pull request #3267 from Elsensee/ticket/13478Joas Schilling2015-01-091-1/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13478] Add event core.bbcode_cache_init_end
| | * | | | | [ticket/13478] Add event core.bbcode_cache_init_endOliver Schramm2015-01-081-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13478
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/13470] Fix non-empty username array if no usernames are givenOliver Schramm2015-01-081-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13470
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-061-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3262 from Elsensee/ticket/13466Joas Schilling2015-01-061-0/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13466] Add bitfield and uid to event core.message_parser_check_message
| | * | | | | [ticket/13466] Add bitfield and uid to event core.message_parser_check_messageOliver Schramm2015-01-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13466
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-061-0/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3231 from rxu/ticket/13435Joas Schilling2015-01-061-0/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13435] Add core event to modify submit_post() sql data
| | * | | | | | [ticket/13435] Add core event to modify submit_post() sql datarxu2014-12-131-0/+24
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13435