aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9546] Also delete bookmarks, when a topic is deleted.Joas Schilling2010-05-161-1/+1
| | | | PHPBB3-9546
* Merge branch 'bug/cs278/59465' into develop-olympusNils Adermann2010-04-041-1/+1
|\ | | | | | | | | | | * bug/cs278/59465: [bug/59465] Remove start=0 from topic pagination links. [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
| * [bug/59465] Remove start=0 from topic pagination links.Chris Smith2010-03-181-1/+1
| | | | | | | | Patch once again by nn-.
* | Merge branch 'bug/nickvergessen/59135' into develop-olympusNils Adermann2010-04-012-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/59135: [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135) Conflicts: phpBB/docs/CHANGELOG.html
| * | [bug/59135] Fix open_basedir issues when accessing styles- and ↵Joas Schilling2010-03-132-4/+4
| | | | | | | | | | | | | | | | | | language-management. (Bug #59135) introduced in r10496 and r10360/r10361
* | | Merge branch 'bug/kellanved/59425' into develop-olympusNils Adermann2010-03-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * bug/kellanved/59425: [bug/59425] Correctly check for double inclusion in captcha garbage collection
| * | | [bug/59425] Correctly check for double inclusion in captcha garbage collectionU-H-PC\H2010-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The check to avoid the double inclusion of the captcha factory class in the garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory". TerryE pointed the problem out, thanks!
* | | | [bug/58465] The redirect hidden field is now XHTML conformU-H-PC\H2010-03-281-1/+1
|/ / / | | | | | | | | | The result of build_url was falsely un-entitized.
* | | Merge branch 'bug/jellydoughnut/56965' into develop-olympusNils Adermann2010-03-261-42/+48
|\ \ \ | | | | | | | | | | | | | | | | * bug/jellydoughnut/56965: [bug/56965] Redirect fails with directory traversal
| * | | [bug/56965] Redirect fails with directory traversalJosh Woody2010-03-221-42/+48
| | | | | | | | | | | | | | | | Correct invalid r10536 with a boolean flag. Note that this fix for the bug will not actually correct the redirects, it will only prevent phpBB from redirecting outside $phpbb_root_path when redirect()'s third argument is not provided.
* | | | Merge branch 'bug/cs278/58685' into develop-olympusNils Adermann2010-03-181-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bug/cs278/58685: [bug/58685] Correct spelling errors in append_sid() comments.
| * | | | [bug/58685] Correct spelling errors in append_sid() comments.Chris Smith2010-03-181-2/+2
| | | | |
* | | | | Merge branch 'bug/cs278/58025' into develop-olympusNils Adermann2010-03-181-0/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/cs278/58025: [bug/58025] Search robots are now redirected if they send a SID in the request Conflicts: phpBB/docs/CHANGELOG.html
| * | | | [bug/58025] Search robots are now redirected if they send a SID in the requestChris Smith2010-03-131-0/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Previously search robots could stumble upon a board link somewhere on the web containing a SID they'd follow it and end up indexing that page with the SID in the request URI, this fix prevents that by redirecting them to the same URI just without the SID.
* | | | [feature/memcache-multi-server] Changing format for multiple memcache hosts. ↵mrkurt2010-03-181-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing code style issues in changes. Host and ports are now represented like this in config: host1/port1,host2/port2,host3/port3
* | | | [feature/memcache-multi-server] Adding support for multiple memcache servers ↵mrkurt2010-03-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to acm_memcache.php You can define multiple memcache servers in your config using this format: host::port,host::port,host::port Example: @define(PHPBB_ACM_MEMCACHE, '127.0.0.1::11211,10.0.0.2::11211,memcache1::11211'
* | | | Merge branch 'bug/jellydoughnut/58415' into develop-olympusNils Adermann2010-03-171-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * bug/jellydoughnut/58415: Allow setting parent forums regardless of permission settings. (Bug #58415) Conflicts: phpBB/docs/CHANGELOG.html
| * | | Allow setting parent forums regardless of permission settings. (Bug #58415)Josh Woody2010-03-171-2/+2
| | |/ | |/|
* | | Merge branch 'bug/dpward/58755' into develop-olympusNils Adermann2010-03-071-1/+1
|\ \ \
| * | | [bug/58755] Fix a redirection bug that can occur after loginDavid Ward2010-03-071-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue affects any forum (i.e. https://myforum/phpBB3/) where: - the forum is located in a directory underneath the web root (i.e., NOT https://myforum/) - a user accesses the forum with a URI pointing to a directory rather than a script (i.e., NOT https://myforum/phpBB3/index.php) - the URI used ends in a slash (i.e., NOT https://myforum/phpBB3) If these conditions are met, after successful login the user is redirected to an invalid URI (i.e., https://myforum/phpBB3/phpBB3?sid=). This change fixes extract_current_page() to handle the case correctly where the URI ends in a slash and is not the web root. So after successful login, the redirection back to the main page will work (i.e., https://myforum/phpBB3/?sid=)
* | | Merge branch 'bug/evil3/12531' into develop-olympusNils Adermann2010-03-071-2/+2
|\ \ \ | |/ / |/| |
| * | [bug/12531] proposed solution for bug #12531Igor Wiedler2010-03-061-2/+2
| |/
* | Merge branch 'master' into develop-olympusNils Adermann2010-03-061-1/+1
|\ \
| * | Incrementing the version number to 3.0.7-PL1Nils Adermann2010-03-051-1/+1
| | |
| * | Increment version number to 3.0.7Nils Adermann2010-02-281-1/+1
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10555 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merge r10551 into 3.0.7: Make the new {INTTEXT} work on pcre installations ↵Nils Adermann2010-02-281-9/+20
| | | | | | | | | | | | | | | | | | without utf8 support, it only matches ascii characters & numbers there. [Bug #58055] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10552 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | #58055 againHenry Sudhof2010-02-271-2/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10547 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | okay, minus should work now #58055Henry Sudhof2010-02-261-2/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10545 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | possible cause of #58055Henry Sudhof2010-02-261-1/+1
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10543 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | only whitespaces, not newlinesHenry Sudhof2010-02-251-2/+2
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10541 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to ↵Nils Adermann2010-02-235-3/+70
| | | | | | | | | | | | | | | | | | enable quick reply in all forums. -- Voila ;-) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10529 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merge r10526 into 3.0.7 branch.Andreas Fischer2010-02-231-6/+7
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10527 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merge r10515 into 3.0.7 branchNils Adermann2010-02-231-1/+1
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | sneak attack merge r10518Chris Smith2010-02-221-1/+1
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Enter stage left: the INTTEXT token (merge)Henry Sudhof2010-02-212-2/+8
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | merging TEXT warn from 3_0_0Henry Sudhof2010-02-201-91/+107
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10512 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Bump version to 3.0.7-RC2.Andreas Fischer2010-02-181-1/+1
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10506 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merge r10497 and r10499 into 3.0.7 - #57755Andreas Fischer2010-02-182-3/+5
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to ↵Joas Schilling2010-02-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | folders. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merge r10484 and r10485 into 3.0.7 branch.Andreas Fischer2010-02-083-5/+6
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Fix #57395, a regression from r10427Josh Woody2010-02-071-1/+1
| | | | | | | | | | | | | | | | | | (merging r10482 into branch_3_0_7) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10483 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Merge r10473 into the 3.0.7 branch.Josh Woody2010-02-041-2/+16
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
| * | Change version numbers to 3.0.7 and 3.0.7-RC1 for a QA releaseNils Adermann2010-02-011-1/+1
| | | | | | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10467 89ea8834-ac86-4346-8a33-228a782c2dd0
* | | [bug/51555] proposed fix for bug #51555Igor Wiedler2010-03-061-1/+1
| |/ |/|
* | Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY.Marek A. Ruszczyński2010-03-021-2/+2
| | | | | | | | | | | | Moved the MIN(smiley_order) to the SELECT column list now, so it can be used for sorting on MySQL 4, but also still works on MSSQL, which the bug was originally about.
* | Make the new {INTTEXT} work on pcre installations without utf8 support, it ↵Nils Adermann2010-02-271-9/+20
| | | | | | | | | | | | only matches ascii characters & numbers there. [Bug #58055] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10551 89ea8834-ac86-4346-8a33-228a782c2dd0
* | #58055 againHenry Sudhof2010-02-271-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10546 89ea8834-ac86-4346-8a33-228a782c2dd0
* | okay, minus should work now #58055Henry Sudhof2010-02-261-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10544 89ea8834-ac86-4346-8a33-228a782c2dd0
* | possible cause of #58055Henry Sudhof2010-02-261-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10542 89ea8834-ac86-4346-8a33-228a782c2dd0
* | only whitespaces, not newlinesHenry Sudhof2010-02-251-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10540 89ea8834-ac86-4346-8a33-228a782c2dd0