aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge PR #1219 branch 'develop-olympus' into developOleg Pudeyev2013-01-271-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input.
| * | [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | PHPBB3-11343
| * | [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | PHPBB3-11343
| * | [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Use strict comparison when checking whether stored user_actkey is equal to user input. PHPBB3-11343
| * | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
* | | | [ticket/9492] Fix typo in SQL queryJoas Schilling2013-01-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9492
* | | | [ticket/9492] Ensure to delete the avatar/rank data when we change itJoas Schilling2013-01-171-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9492
* | | | [ticket/9492] Ensure to update all avatar values when the avatar is changedJoas Schilling2013-01-172-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9492
* | | | [ticket/9492] Fix undefined user_avatar_* values when updating the group avatarJoas Schilling2013-01-171-11/+17
| | | | | | | | | | | | | | | | PHPBB3-9492
* | | | [ticket/9492] Retain custom ranks and avatars when setting users default groupJoas Schilling2013-01-171-30/+53
| | | | | | | | | | | | | | | | PHPBB3-9492
* | | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into developNathan Guse2013-01-151-0/+16
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
| * | | [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | drops default columns with T-SQL before attempting drop column to avoids sql exception. This is a huge annoyance in UMIL scripts running under sql server.
* | | | Merge remote-tracking branch 'remotes/nickv/ticket/11201' into developNathan Guse2013-01-153-9/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11201: [ticket/11201] Remove database column on update [ticket/11201] Remove MSN/WLM fields
| * | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-113-9/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype uses a different login ID and service, the values in this field are useless. So we can safely remove the field and the links/functions we create. PHPBB3-11201
* | | | Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into developNathan Guse2013-01-141-14/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais # Via Bruno Ais * remotes/brunoais/ticket/11171: [ticket/11171] Moved the DB schema changes to its place [ticket/11171] Cleanup of leftovers [ticket/11171] Adapted the code in report.php [ticket/11171] Use the options stored to decide how to show it [ticket/11171] DB changes for the update [ticket/11171] DB additions for these changes Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql
| * | | [ticket/11171] Cleanup of leftoversBruno Ais2012-12-071-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't notice that there were actually leftovers from the other PR. Anyway, this will remove all the leftovers I noticed from the other PR. PHPBB3-11171
| * | | [ticket/11171] Use the options stored to decide how to show itBruno Ais2012-12-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added what's needed so that the post in the report is parsed the same way as it was being parsed when the post was reported PHPBB3-11171
* | | | Merge PR #1182 branch 'develop-olympus' into developOleg Pudeyev2013-01-091-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
| * | | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11301
| * | | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11301
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-061-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/11292] Fix: Newlines removed in display of PM reports
| * | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * gn36/ticket/11292: [ticket/11292] Fix: Newlines removed in display of PM reports
| | * | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
* | | | | [ticket/11309] phpbb_extension_interface::disable_step correct docblock.Erik Frèrejean2013-01-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `@return` documentation of the `phpbb_extension_interface::disable_step` method states incorrect that the method returns null, as it returns false or a state. PHPBB3-11309
* | | | | Merge remote-tracking branch 'erikfrerejean/ticket/11283' into developAndreas Fischer2013-01-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * erikfrerejean/ticket/11283: [ticket/11283] Extension manager follow symlinks.
| * | | | | [ticket/11283] Extension manager follow symlinks.Erik Frèrejean2012-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All extensions are located in the `phpBB/ext` directory, however the `phpbb_extension_manager::all_available()` method only looks into actual directories and ignores symlinks. Add the `RecursiveDirectoryIterator::FOLLOW_SYMLINKS` flag to the `new RecursiveDirectoryIterator` call so that you can store extensions in a different location and use symlinks so that phpBB can recognise them. PHPBB3-11283
* | | | | | [ticket/11305] Check for $cache being null before using it in db drivers.Oleg Pudeyev2013-01-0210-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason why db drivers must have a cache to work. They query the database, that part works without caches. PHPBB3-11305
* | | | | | [ticket/11305] Retrieve cache driver from container rather than cache service.Oleg Pudeyev2013-01-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only covers some of the call sites. PHPBB3-11305
* | | | | | [ticket/11305] Extract hook finder from cache service.Oleg Pudeyev2013-01-022-30/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike most other things in cache service, hook finder does not need a database connection. PHPBB3-11305
* | | | | | [ticket/11306] Add docblocks to all container related functionsIgor Wiedler2013-01-021-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11306
* | | | | | [ticket/11306] Introduce phpbb_create_default_containerIgor Wiedler2013-01-021-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracts default container construction to factory function, removing boilerplate duplication for container construction. PHPBB3-11306
* | | | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-311-42/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11037: [ticket/11037] Fix unit tests. [ticket/11037] Update services.yml. [ticket/11037] Add/update docblocks. [ticket/11037] Eliminate globals from cache service.
| * | | | | | [ticket/11037] Add/update docblocks.Oleg Pudeyev2012-12-261-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11037
| * | | | | | [ticket/11037] Eliminate globals from cache service.Oleg Pudeyev2012-12-241-42/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11037
* | | | | | | Merge remote-tracking branch 'p/ticket/11188' into developAndreas Fischer2012-12-311-5/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11188: [ticket/11188] Reduce waste. [ticket/11188] add result count query for author search [ticket/11188] add count query to postgres search
| * | | | | | | [ticket/11188] Reduce waste.Oleg Pudeyev2012-12-301-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
| * | | | | | | [ticket/11188] add result count query for author searchDhruv2012-12-301-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
| * | | | | | | [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-311-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | * develop-olympus: [ticket/11293] Add a note that mysqli should be in front of mysql.
| * | | | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if both are available. PHPBB3-11293
* | | | | | Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-297-24/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11259: [ticket/11259] htmlspecialchars($phpbb_admin_path) [ticket/11259] adm_relative_path -> phpbb_adm_relative_path [ticket/11259] Also make adm_relative_path available in the container [ticket/11259] Make phpbb_admin_path available everywhere Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| * | | | | | [ticket/11259] htmlspecialchars($phpbb_admin_path)Nathan Guse2012-12-103-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11259
| * | | | | | [ticket/11259] adm_relative_path -> phpbb_adm_relative_pathNathan Guse2012-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can assume they properly format their config settings, right? PHPBB3-11259
| * | | | | | [ticket/11259] Also make adm_relative_path available in the containerNathan Guse2012-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11259
| * | | | | | [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-094-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11259
* | | | | | | Merge remote-tracking branch 'p/ticket/10758' into developAndreas Fischer2012-12-257-47/+100
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10758: [ticket/10758] Add return to the other compat function. [ticket/10758] Add periods. [ticket/10758] Yes, only one empty line. [ticket/10758] Add deprecated tags. [ticket/10758] Add compat functions. [ticket/10758] Admin is not working yet. [ticket/10758] Test moderator and admin permissions. [ticket/10758] Check that acl was changed in the test. [ticket/10758] Extract obtain_user_data for the benefit of tests. [ticket/10758] Functional test for changing a user's permission. [ticket/10758] Spelling fix. [ticket/10758] Add a test for acp login. [ticket/10758] Dependency inject parameters into update_foes. [ticket/10758] Dependency inject parameters into cache_moderators.
| * | | | | | [ticket/10758] Add return to the other compat function.Oleg Pudeyev2012-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| * | | | | | [ticket/10758] Add periods.Oleg Pudeyev2012-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| * | | | | | [ticket/10758] Yes, only one empty line.Oleg Pudeyev2012-12-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| * | | | | | [ticket/10758] Add deprecated tags.Oleg Pudeyev2012-12-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758