aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-12-087-76/+253
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10205] Reduce nesting in mysql drivers. [ticket/10205] Rewrite _sql_error implementations to have a single return. [ticket/10205] Cosmetic changes. [ticket/10205] Add some columns to the empty fixture file for mssqlnative. [ticket/10205] Delete stray return. [ticket/10205] Test failed connection attempts. [ticket/10205] Check for function existence in mssql connect method. [ticket/10205] Convert mssqlnative driver to the same logic. [ticket/10205] Fix a parse error in oracle driver. [ticket/10205] Fix remaining db drivers. [ticket/10205] Avoid calling mysqli functions when mysqli is missing. [ticket/10205] Account for potentially missing extensions in dbal. Conflicts: tests/fixtures/empty.xml
| * Merge remote-tracking branch 'p/ticket/10205' into develop-olympusAndreas Fischer2012-12-087-76/+253
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10205: [ticket/10205] Reduce nesting in mysql drivers. [ticket/10205] Rewrite _sql_error implementations to have a single return. [ticket/10205] Cosmetic changes. [ticket/10205] Add some columns to the empty fixture file for mssqlnative. [ticket/10205] Delete stray return. [ticket/10205] Test failed connection attempts. [ticket/10205] Check for function existence in mssql connect method. [ticket/10205] Convert mssqlnative driver to the same logic. [ticket/10205] Fix a parse error in oracle driver. [ticket/10205] Fix remaining db drivers. [ticket/10205] Avoid calling mysqli functions when mysqli is missing. [ticket/10205] Account for potentially missing extensions in dbal.
| | * [ticket/10205] Reduce nesting in mysql drivers.Oleg Pudeyev2012-12-042-28/+22
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Rewrite _sql_error implementations to have a single return.Oleg Pudeyev2012-12-045-20/+34
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Cosmetic changes.Oleg Pudeyev2012-12-045-8/+8
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Check for function existence in mssql connect method.Oleg Pudeyev2012-12-041-0/+8
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Convert mssqlnative driver to the same logic.Oleg Pudeyev2012-12-041-20/+32
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Fix a parse error in oracle driver.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Fix remaining db drivers.Oleg Pudeyev2012-12-045-43/+93
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Avoid calling mysqli functions when mysqli is missing.Oleg Pudeyev2012-12-041-4/+14
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Account for potentially missing extensions in dbal.Oleg Pudeyev2012-12-045-4/+93
| | | | | | | | | | | | PHPBB3-10205
* | | [ticket/10679] Use module_auth to limit access to the moduleJoas Schilling2012-12-061-1/+1
| | | | | | | | | | | | PHPBB3-10679
* | | [ticket/10679] Add new permission for changing profile field informationJoas Schilling2012-12-061-0/+5
| | | | | | | | | | | | | | | | | | The setting is copied from "Can use signature" PHPBB3-10679
* | | Merge PR #1053 branch 'develop-olympus' into developOleg Pudeyev2012-12-051-0/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP Conflicts: phpBB/includes/ucp/ucp_prefs.php phpBB/styles/prosilver/template/ucp_prefs_personal.html
| * | [ticket/10841] adding space after ifSenky2012-12-051-2/+2
| | | | | | | | | | | | PHPBB3-10841
| * | [ticket/10841] removing unnecessary spacingSenky2012-12-051-2/+2
| | | | | | | | | | | | PHPBB3-10841
| * | [ticket/10841] changing affectedrows check to COUNT in sqlSenky2012-12-051-6/+8
| | | | | | | | | | | | | | | | | | this sould reduce load and be faster. Also freeresult functions added PHPBB3-10841
| * | [ticket/10841] Modifying style and language selectors in UCPSenky2012-12-051-0/+30
| | | | | | | | | | | | | | | | | | | | | Commit also deletes all unnecessary blank spaces at the end of the lines in both ucp_prefs_personal.html PHPBB3-10841
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-3/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. Conflicts: phpBB/includes/functions_messenger.php
| * | [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
| | | | | | | | | | | | PHPBB3-10602
| * | [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep the last queue run time around, therefore for determining whether enough time has passed since the last run we can simply use this config variable. When there is no queue file we consider a queue run successful. Previously queue.php ("cache file") modification time would be used for determining whether enough time has passed since last queue run. The problem was that modification time would be updated whenever anything was added to the queue, creating a situation where if queue is processed less frequently than it is added to that email would not be sent. PHPBB3-10602
* | [ticket/11247] Fix wrong property reference in flock class.Oleg Pudeyev2012-12-051-1/+1
| | | | | | | | PHPBB3-11247
* | Merge remote-tracking branch 'p/ticket/10103' into developAndreas Fischer2012-12-044-72/+157
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10103: [ticket/10103] New and improved wording. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. [ticket/10103] Try a longer sleep for travis. [ticket/10103] Convert the rest of the tree to flock class. [ticket/10103] Test for flock lock class, with concurrency no less. [ticket/10103] Use flock lock class in messenger. [ticket/10103] Factor out flock lock class.
| * | [ticket/10103] New and improved wording.Oleg Pudeyev2012-12-041-2/+2
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] $rv had too few characters.Oleg Pudeyev2012-12-041-3/+3
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Correct flock class documentation.Oleg Pudeyev2012-12-041-4/+13
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Convert the rest of the tree to flock class.Oleg Pudeyev2012-12-042-8/+16
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Use flock lock class in messenger.Oleg Pudeyev2012-12-041-6/+8
| | | | | | | | | | | | PHPBB3-10103
| * | [ticket/10103] Factor out flock lock class.Oleg Pudeyev2012-12-042-58/+124
| | | | | | | | | | | | PHPBB3-10103
* | | [ticket/10091] Bump minimum supported postgresql version to 8.3.Oleg Pudeyev2012-12-041-1/+1
|/ / | | | | | | PHPBB3-10091
* | Merge remote-tracking branch 'p/ticket/9983' into developAndreas Fischer2012-12-031-1/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9983: [ticket/9983] Also check generic APC enable/disable. [ticket/9983] Use APC instead of apc in error messages. [ticket/9983] Skip tests if APC is not enabled for CLI. [ticket/9983] Test for apc cache driver. [ticket/9983] Add phpbb prefix to global variables. [ticket/9983] Empty line by request. [ticket/9983] Indeed, it is <?php. [ticket/9983] Add a test for destroy. [ticket/9983] Exercise exists also. [ticket/9983] Add a purge test. [ticket/9983] Rename test methods. [ticket/9983] get/put cache test moved to a base class. [ticket/9983] Create driver in setup in null driver test. [ticket/9983] Split cache test into per-driver files. [ticket/9983] Add redis cache driver tests.
| * | [ticket/9983] Empty line by request.Oleg Pudeyev2012-12-021-0/+1
| | | | | | | | | | | | PHPBB3-9983
| * | [ticket/9983] Add redis cache driver tests.Oleg Pudeyev2012-12-011-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to not overwrite data in default redis store, at least one of redis host or post must be explicitly specified. Redis cache driver constructor has been modified to accept host and port as parameters. This was not added to public API as there are more parameters being passed via global constants. PHPBB3-9983
* | | Merge PR #545 branch 'brunoais/ticket/10601' into developOleg Pudeyev2012-12-011-1/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10601: [ticket/10601] The ORDER BY is only taking space there [ticket/10601] New approach in the update algorithm [ticket/10601] Comment to help understanding the code [ticket/10601] Requested code changes [ticket/10601] Cosmetic code changes [ticket/10601] Database updating code v2 [ticket/10601] Database updating code [ticket/10601] Comment explaning the basename applied to categories [ticket/10601] Correctly access class property [ticket/10601]Move Inbox the default in private messages module
| * | | [ticket/10601] Comment to help understanding the codeBruno Ais2012-11-281-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10601
| * | | [ticket/10601]Move Inbox the default in private messages moduleBruno Ais2012-11-261-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Did exactly as the answer here asked: http://area51.phpbb.com/phpBB/viewtopic.php?p=234111 PHPBB3-10601
* | | | [ticket/11227] @return void -> @return null, per coding guidelines.Oleg Pudeyev2012-11-3018-24/+24
| |/ / |/| | | | | | | | PHPBB3-11227
* | | Merge PR #974 branch 'bantu/ticket/10875' into developOleg Pudeyev2012-11-304-9/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10875: [ticket/10875] tests/cache/cache_test.php: Use single quotes where possible. [ticket/10875] Test for null cache driver and sql cache. [ticket/10875] Revise sql cache test. [ticket/10875] Must return query result on failure. [ticket/10875] More documentation. [ticket/10875] Spelling fix. [ticket/10875] Add docblocks for phpbb_cache_driver_interface [ticket/10875] Add comment about cache's sql_load() method. [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save(). [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result. [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save(). [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.
| * | | [ticket/10875] Must return query result on failure.Oleg Pudeyev2012-11-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10875
| * | | [ticket/10875] More documentation.Oleg Pudeyev2012-11-301-3/+7
| | | | | | | | | | | | | | | | PHPBB3-10875
| * | | [ticket/10875] Spelling fix.Oleg Pudeyev2012-11-301-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10875
| * | | [ticket/10875] Add docblocks for phpbb_cache_driver_interfaceIgor Wiedler2012-11-141-4/+33
| | | | | | | | | | | | | | | | PHPBB3-10875
| * | | [ticket/10875] Add comment about cache's sql_load() method.Andreas Fischer2012-10-311-0/+6
| | | | | | | | | | | | | | | | PHPBB3-10875
| * | | [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save().Andreas Fischer2012-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously (develop-olympus) $query_result was passed via reference into sql_save(). Now the (possibly changed) result is returned by value. Adjust logic to take this change into account correctly. PHPBB3-10875
| * | | [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save().Andreas Fischer2012-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | phpbb_cache_driver_null::sql_save() has to return $query_result as is instead of null. PHPBB3-10875
| * | | [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.Andreas Fischer2012-10-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sql_save() no longer takes $query_result as a reference, thus this assignment is a no-op. PHPBB3-10875
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-299-13/+13
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/11227] @return void -> @return null in develop-olympus.
| * | | [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-299-13/+13
| | | | | | | | | | | | | | | | PHPBB3-11227
* | | | [ticket/11174] include utf_tools in postgres search backendDhruv2012-11-271-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11174
* | | | [ticket/11174] removes unnecessary space from wordDhruv2012-11-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11174