aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/avatars] Strictly check if avatar list is empty and cache resultMarc Alexander2013-01-081-2/+3
| | | | PHPBB3-10018
* [feature/avatars] Pass phpbb_user object to prepare_form_acp()Marc Alexander2013-01-085-7/+7
| | | | | | | The phpbb_user object might be used for language variables. Pass it as a function argument to prepare_form_acp() instead of using globals. PHPBB3-10018
* [feature/avatars] Pass phpbb_user object to get_custom_html()Marc Alexander2013-01-084-4/+7
| | | | | | | | Pass the phpbb_user object to function get_custom_html(). This object is used in that method. Also fixed incorrect arguments to get_custom_html() in phpbb_get_avatar(). PHPBB3-10018
* [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-0710-41/+36
| | | | | | | | Remove the $request property from the phpbb_avatar_driver class and rather pass it as function argument if it's needed in a function. Currently this is only the case for the class methods prepare_form() and process_form(). PHPBB3-10018
* [feature/avatars] Use empty() instead of sizeof()Marc Alexander2013-01-072-2/+2
| | | | PHPBB3-10018
* [feature/avatars] Add function for localizing errorsMarc Alexander2013-01-065-58/+35
| | | | PHPBB3-10018
* [feature/avatars] Add missing docblocks to avatar managerMarc Alexander2013-01-051-0/+16
| | | | PHPBB3-10018
* [feature/avatars] Improve handling of incorrect input for avatarsMarc Alexander2013-01-042-1/+13
| | | | | | | | | The upload avatar driver will now inform the user if insufficient data has been entered for both remote and local avatar uploads. The local avatar driver (gallery avatar) will also inform the user if he didn't select a category and/or file before submitting. PHPBB3-10018
* [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-048-18/+18
| | | | | | | | Although get_user_avatar() is not new, the phpbb prefix was prepended. This is due to the fact that it was entirely rewritten and is therefore more or less a completely new function. PHPBB3-10018
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-0429-193/+431
|\ | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_groups.php
| * 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
| | * | | | [ticket/10758] Add compat functions.Oleg Pudeyev2012-12-201-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| | * | | | [ticket/10758] Extract obtain_user_data for the benefit of tests.Oleg Pudeyev2012-12-192-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| | * | | | [ticket/10758] Spelling fix.Oleg Pudeyev2012-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10758
| | * | | | [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-153-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
| | * | | | [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-156-32/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
* | | | | | [feature/avatars] Let the server handle http or https for gravatarsMarc Alexander2012-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
* | | | | | [feature/avatars] Add missing explanation to docblock of get_all_drivers()Marc Alexander2012-12-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
* | | | | | [feature/avatars] Some more miscellaneous changesMarc Alexander2012-12-277-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
* | | | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-2449-1895/+2395
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'p/ticket/11248' into developAndreas Fischer2012-12-221-1712/+1712
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11248: [ticket/11248] Convert line endings to LF - develop edition.
| | * | | | | [ticket/11248] Convert line endings to LF - develop edition.Oleg Pudeyev2012-12-071-1712/+1712
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11248
| * | | | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-2213-20/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11037: [ticket/11037] Eliminate global $db usage in cache drivers.
| | * | | | | | [ticket/11037] Eliminate global $db usage in cache drivers.Oleg Pudeyev2012-12-2013-20/+17
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only time $db is needed in cache drivers is to navigate the result set in sql_save. Pass it as a parameter in that function. PHPBB3-11037
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-201-2/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10880] The m_approve permisson no longer implies f_noapprove. Conflicts: phpBB/posting.php