aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | [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
* | | | | 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
| * | | | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-191-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10880
* | | | | Merge PR #1133 branch 'marc1706/ticket/10954' into developOleg Pudeyev2012-12-191-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/10954: [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [ticket/10954] Miscellaneous coding fixes [ticket/10954] Use quotes in attribute selectors and reduce use of each [ticket/10954] Change currentObject to $this for consistency [ticket/10954] Use function for closing alert popup [ticket/10954] Simplify marking forums read and fix topic marking [ticket/10954] Join array of class names instead of creating a string [ticket/10954] Fix coding guidelines infractions [ticket/10954] Change behavior of marking topics/forums [ticket/10954] Fix scope of current_object [ticket/10954] Only call $(this) once and reduce number of DOM traversals [ticket/10954] Modify is_ajax check for consistency [ticket/10954] Mark topics read without popup [ticket/10954] Mark forums read without popup or page refresh
| * | | | | [ticket/10954] Change behavior of marking topics/forumsMarc Alexander2012-12-141-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will now display a popup message for 3 seconds which will confirm the taken action. The amount of DOM traversals have been significantly reduced and jQuery.each is now used instead of for loops. Additionally, it is now possible to click on the mark topics/forums read links without triggering an AJAX error. PHPBB3-10954
| * | | | | [ticket/10954] Modify is_ajax check for consistencyMarc Alexander2012-12-121-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10954
| * | | | | [ticket/10954] Mark forums read without popup or page refreshMarc Alexander2012-12-121-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10954
* | | | | | Merge PR #1147 branch 'marc1706/ticket/10763' into developOleg Pudeyev2012-12-181-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/10763: [ticket/10763] Use self when calling get_extension() in filespec class [ticket/10763] Make functions for remote avatars static
| * | | | | | [ticket/10763] Use self when calling get_extension() in filespec classMarc Alexander2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10763