aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
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-043-10/+10
|\ | | | | | | | | | | * 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-.
| * [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.Chris Smith2010-03-182-9/+9
| | | | | | | | | | | | Having start=0 makes search engines index the page twice once with and once without the start=0 parameter. This results in duplicate results in the search results. Patch contributed by nn-.
* | Merge branch 'bug/nickvergessen/9047' into develop-olympusNils Adermann2010-04-042-8/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/9047: [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047) Conflicts: phpBB/docs/CHANGELOG.html
| * | [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)Joas Schilling2010-04-042-8/+11
| | |
* | | Merge branch 'feature/nickvergessen/unapproved-posts-in-feed' into ↵Nils Adermann2010-04-042-9/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * feature/nickvergessen/unapproved-posts-in-feed: [feature/unapproved-posts-in-feed] Little changelog correction [feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu [feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed Conflicts: phpBB/docs/CHANGELOG.html
| * | | [feature/unapproved-posts-in-feed] Little changelog correctionJoas Schilling2010-04-041-1/+1
| | | |
| * | | [feature/unapproved-posts-in-feed] Increase performance of ↵Joas Schilling2010-04-041-3/+8
| | | | | | | | | | | | | | | | is_moderator_approve_forum() as per bantu
| * | | [feature/unapproved-posts-in-feed] View note for moderators on unapproved ↵Joas Schilling2010-04-042-9/+25
| | | | | | | | | | | | | | | | posts/topics with unapproved posts in ATOM Feed
* | | | Merge branch 'bug/nickvergessen/9512' into develop-olympusNils Adermann2010-04-042-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/9512: [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | [bug/9512] Fix dead link in MCP on reports for global announcements in ↵Joas Schilling2010-04-042-1/+2
| | |/ / | |/| | | | | | | | | | prosilver. (Bug #9512)
* | | | Merge branch 'bug/nickvergessen/58745' into develop-olympusNils Adermann2010-04-042-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/58745: [bug/58745] Correct changelog message [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | [bug/58745] Correct changelog messageJoas Schilling2010-04-031-1/+1
| | | | |
| * | | | [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)Joas Schilling2010-04-032-1/+2
| | | | |
* | | | | Merge branch 'bug/nickvergessen/58695' into develop-olympusNils Adermann2010-04-042-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/nickvergessen/58695: [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | [bug/58695] Use method to get forums where user is moderator, thanks to ↵Joas Schilling2010-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | bantu for the hint
| * | | | [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)Joas Schilling2010-04-032-2/+3
| | |/ / | |/| |
* | | | Merge branch 'bug/bantu/9108' into develop-olympusNils Adermann2010-04-012-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bug/bantu/9108: [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425) Conflicts: phpBB/docs/CHANGELOG.html
| * | | | [bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old ↵Andreas Fischer2010-04-012-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #58425) The order in the FROM clause is important. The posts table has to be the last one in the chain, so it can be correctly bound with the forums table in the LEFT JOIN. This only affects the overall feed (board-wide feed). All the other feeds are unaffected.
* | | | | Merge branch 'bug/nickvergessen/59135' into develop-olympusNils Adermann2010-04-013-4/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-133-4/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | language-management. (Bug #59135) introduced in r10496 and r10360/r10361
* | | | Merge branch 'bug/kellanved/59425' into develop-olympusNils Adermann2010-03-282-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * 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-282-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-282-1/+2
|/ / / / | | | | | | | | | | | | 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-182-0/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-132-0/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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/arstechnica/memcache-multi-server] Add memcache-multi-server to the ↵Nils Adermann2010-03-181-0/+1
| | | | | | | | | | | | | | | | changelog.
* | | | [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-172-2/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * 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-172-2/+3
| | | |
* | | | Merge branch 'bug/dpward/58755' into develop-olympusNils Adermann2010-03-072-1/+2
|\ \ \ \
| * | | | Adding the bugfix for #58755 to the changelog.Nils Adermann2010-03-071-0/+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-072-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | [bug/12531] proposed solution for bug #12531Igor Wiedler2010-03-062-2/+3
| | | |
| * | | Oops, forgot the changelog for #57105Cullen Walsh2010-03-061-0/+1
| |/ /
* | | Merge branch 'master' into develop-olympusNils Adermann2010-03-065-6/+12
|\ \ \
| * | | exclude the image file with text in the name from having newlines fixedNils Adermann2010-03-051-1/+1
| | | |
| * | | Incrementing the version number to 3.0.7-PL1Nils Adermann2010-03-055-7/+13
| | | |
| * | | Mark the bugfix #58595 as a security fixNils Adermann2010-03-051-1/+2
| | | |
| * | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.Andreas Fischer2010-03-052-2/+9
| | | |
* | | | Merge branch 'bug/evil3/51555' into develop-olympusNils Adermann2010-03-062-1/+2
|\ \ \ \
| * | | | [bug/51555] proposed fix for bug #51555Igor Wiedler2010-03-062-1/+2
| | |_|/ | |/| |
* | | | Mark the bugfix #58595 as a security fixNils Adermann2010-03-051-2/+8
| | | |