aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11215] Add commented-out URL rewrite capability to .htaccessDavid King2013-09-021-0/+8
| | | | PHPBB3-11215
* Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-021-0/+5
|\
| * Merge branch 'develop-olympus' into developAndreas Fischer2013-09-021-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/includes/functions_posting.php
| | * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-021-1/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/language/en/email/forum_notify.txt phpBB/language/en/email/newtopic_notify.txt phpBB/language/en/email/topic_notify.txt
| | | * [ticket/11769] Allow '0' as usernameJoas Schilling2013-09-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11769
| | | * [ticket/11769] Fix language issues in the doc blocksJoas Schilling2013-08-231-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11769
| | | * [ticket/11769] Correctly supply the post author's username in posting.phpJoas Schilling2013-08-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only supply the username, when it is a guest posting or we edit and it was supplied, otherwise post_data might hold data of the post we quote, in which case username is the original poster, not the current one. PHPBB3-11769
* | | | [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
| | | | | | | | | | | | | | | | PHPBB3-11215
* | | | Merge branch 'develop' into ticket/11215David King2013-08-31275-49476/+131
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2815-112/+70
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | * \ \ Merge branch 'develop-olympus' into developJoas Schilling2013-08-261-0/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/11799] Send anti abuse headers in "new password" emails.
| | | * | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11799
| | * | | Merge remote-tracking branch 'cyberalien/ticket/11754' into developAndreas Fischer2013-08-181-2/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11754: [ticket/11754] Remove styleswitcher leftovers
| | | * | | [ticket/11754] Remove styleswitcher leftoversVjacheslav Trushkin2013-07-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11754
| | * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-151-2/+2
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic Conflicts: tests/test_framework/phpbb_functional_test_case.php
| | | * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-151-2/+2
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic
| | | | * | [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11775
| | | | * | [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-011-1/+1
| | | | | |
| | * | | | [ticket/11774] Fix constant to avoid PHP errorsOliver Schramm2013-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11774
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-081-7/+34
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (16) and Igor Wiedler (6) # Via Joas Schilling (5) and Igor Wiedler (2) * nickvergessen/ticket/11574: (22 commits) [ticket/11574] Remove install/udpate/new/ fallback from database_update.php [ticket/11574] Do not display incompatible package note after successful update [ticket/11574] Remove old "continue step"-message [ticket/11574] Change order of files and database update [ticket/11574] Fix more issues in the updater [ticket/11574] Add trailing slash for consistency [ticket/11574] Fix table prefix in database updater [ticket/11574] Fix various path issues in the updater [ticket/11574] Make install language filename less crazy [ticket/11574] Use alternate DI config file for updater [ticket/11574] Include normalizer so it loads form the correct directory [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) [ticket/11574] Use log object instead of old function [ticket/11574] Include vendor into update packages [ticket/11574] Create phpbb_log object before using it. [ticket/11574] Add correct language parameter to return links [ticket/11574] Use request object rather then request_var function [ticket/11574] Load new language files whenever possible [ticket/11574] Require new files in install/index.php and add a class loader [ticket/11574] Require new files in database_update.php and add a class loader ...
| | | * \ \ \ Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-3010-61/+56
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (130 commits) [ticket/11638] Changed the layout to match the other similar commits [ticket/11640] removed the space that I wonder what it was doing there. [ticket/11749] Move event after all template data has been defined [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper [ticket/11749] Template events for topic_list_row_pre/append [ticket/11749] PHP Events for viewforum.php [ticket/11749] PHP Events for search.php [ticket/11740] Update FAQ to include Ideas Centre [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version [ticket/11741] Fix empty brackets and remove bullet [ticket/11638] Removed the unneeded reset. [ticket/11638] Use the $parse_flags like the other commits [ticket/11638] Reverted to use the $parse tags way as the other ones [ticket/11638] Updated: bitwise $parse_flags use optionset() [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11667] Use @inheritdoc ...
| | | * | | | [ticket/11574] Fix more issues in the updaterIgor Wiedler2013-07-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stupid mistake in phpbb_create_update_container * Do not bootstrap extensions in installer/updater * Fix template lookup in installer/updater * Do not attempt to delete posts from bots The latter is a really fun problem. Since deleting posts now depends on a new db column that does not exist yet, we cannot call delete_post from a migration, ever. By using retain, we can hack around the issue for now. PHPBB3-11574
| | | * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-14256-48956/+1883
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (575 commits) [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php [ticket/11696] Move file to new directory [ticket/11696] Rename constructor to __construct() [ticket/11696] Remove manual loading of db_tools in extension controller test [ticket/11696] Rename db_tools.php so it can be autoloaded [ticket/11698] Moving all autoloadable files to phpbb/ [ticket/11694] Do not locate assets with root path [ticket/11692] Don't update search_type in dev migration if already appended [ticket/11675] Fix template loop [ticket/11690] Old module class names may get autoloaded by class_exists [ticket/9649] Display information on index for moderators on unapproved posts [ticket/10999] Fix assets_version in ACP [prep-release-3.0.12] More changelog items for the 3.0.12 release. [ticket/11687] Add assets_version to phpbb_config [ticket/11686] Not checking for phpBB Debug errors on functional tests [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". [ticket/11674] Do not include vendor folder if there are no dependencies. [ticket/11685] Remove logout confirmation page [ticket/11684] Remove useless confirmation page after login and admin login [ticket/9657] Define user before injecting ... Conflicts: phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php
| | | * | | | | [ticket/11574] Add trailing slash for consistencyIgor Wiedler2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | * | | | | [ticket/11574] Fix various path issues in the updaterIgor Wiedler2013-07-141-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | * | | | | [ticket/11574] Make install language filename less crazyIgor Wiedler2013-07-131-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | * | | | | [ticket/11574] Use alternate DI config file for updaterIgor Wiedler2013-07-132-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | * | | | | [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)Joas Schilling2013-07-132-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | * | | | | [ticket/11574] Find language files in update/new before throwing an errorJoas Schilling2013-07-131-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | * | | | | [ticket/11574] Try to load updated service.yml before the default oneJoas Schilling2013-07-131-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | * | | | | | Merge remote-tracking branch 'brunoais/ticket11639' into developJoas Schilling2013-08-041-9/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket11639: [ticket/11639] Changing how censorship is handled. [ticket/11639] Removed a non-needed unset [ticket/11639] Whitespace fixing [ticket/11639] Whitespace fixing [ticket/11639] Added an useful comment. [ticket/11639] generate_text_for_display on functions_posting.php
| | | * | | | | | [ticket/11639] Changing how censorship is handled.brunoais2013-08-031-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| | | * | | | | | [ticket/11639] Removed a non-needed unsetBruno Ais2013-07-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| | | * | | | | | [ticket/11639] Whitespace fixingBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| | | * | | | | | [ticket/11639] Whitespace fixingBruno Ais2013-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| | | * | | | | | [ticket/11639] Added an useful comment.Bruno Ais2013-07-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| | | * | | | | | [ticket/11639] generate_text_for_display on functions_posting.phpBruno Ais2013-07-151-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| | * | | | | | | Merge remote-tracking branch 'brunoais/ticket/11642' into developJoas Schilling2013-08-031-11/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11642: [ticket/11642] Use $parse_flags [ticket/11642] Fixed typo in the variable name. [ticket/11642] generate_text_for_display on mcp/mcp_post.php
| | | * | | | | | | [ticket/11642] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642
| | | * | | | | | | [ticket/11642] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642
| | | * | | | | | | [ticket/11642] generate_text_for_display on mcp/mcp_post.phpBruno Ais2013-07-161-11/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642
| | * | | | | | | Merge remote-tracking branch 'brunoais/ticket/11643' into developJoas Schilling2013-08-031-11/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11643: [ticket/11643] Use $parse_flags [ticket/11643] Fixed typo in the variable name. [ticket/11643] generate_text_for_display on mcp/mcp_queue.php
| | | * | | | | | | [ticket/11643] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
| | | * | | | | | | [ticket/11643] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
| | | * | | | | | | [ticket/11643] generate_text_for_display on mcp/mcp_queue.phpBruno Ais2013-07-161-11/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
| | * | | | | | | Merge remote-tracking branch 'brunoais/ticket/11641' into developJoas Schilling2013-08-031-10/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11641: [ticket/11641] Use $parse_flags [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
| | | * | | | | | | [ticket/11641] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11641
| | | * | | | | | | [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.phpBruno Ais2013-07-161-10/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11641
| | * | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-031-2/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| | | * | | | | | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11762
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-28 21:01:09 +0000