diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-14 01:50:22 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-14 01:50:22 +0100 |
| commit | b5142296b182a4bf0d552aac565d90aa0befd07a (patch) | |
| tree | 55693645b3899359e363f8ddf0673bf0bf49257d /phpBB/includes/cron/task/core | |
| parent | 93222cf396192cc4e2d9a4dc741c60efda21404d (diff) | |
| parent | 89f069637cd95f584db924407378b64df9910243 (diff) | |
| download | forums-b5142296b182a4bf0d552aac565d90aa0befd07a.tar forums-b5142296b182a4bf0d552aac565d90aa0befd07a.tar.gz forums-b5142296b182a4bf0d552aac565d90aa0befd07a.tar.bz2 forums-b5142296b182a4bf0d552aac565d90aa0befd07a.tar.xz forums-b5142296b182a4bf0d552aac565d90aa0befd07a.zip | |
Merge remote-tracking branch 'p/ticket/11015' into develop
* p/ticket/11015: (30 commits)
[ticket/11015] Move comment in the right place.
[ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31
[ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.
[ticket/11015] Change permission adding in database updater to new style.
[ticket/11015] Change more docblocks to phpbb_db_driver.
[ticket/11015] Installer still needs 3.0-style dbms name.
[ticket/11015] Include functions.php because it is not always included.
[ticket/11015] Convert database drivers to new spelling in post setup sync.
[ticket/11015] Convert connect test to the new syntax.
[ticket/11015] Restore whitespace to avoid conflict when merging develop.
[ticket/11015] Fix functional test case.
[ticket/11015] Change more docblocks.
[ticket/11015] Include dbms name in exception message.
[ticket/11015] Make phpbb_convert_30_dbms_to_31 more future proof
[ticket/11015] Move db driver class name fixing to function
[ticket/11015] Allow full dbms class name in tests/test_config.php
[ticket/11015] Allow full dbms class name in config.php
[ticket/11015] Remove strange method_exists call
[tracker/11015] Prepend phpbb_db_driver_ for PHPBB_TEST_DBMS
[ticket/11015] Re-introduce accidentally removed require in install_convert
...
Diffstat (limited to 'phpBB/includes/cron/task/core')
| -rw-r--r-- | phpBB/includes/cron/task/core/prune_all_forums.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/cron/task/core/prune_forum.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/cron/task/core/tidy_search.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/includes/cron/task/core/prune_all_forums.php index ee0b5f7626..2c5d38cec0 100644 --- a/phpBB/includes/cron/task/core/prune_all_forums.php +++ b/phpBB/includes/cron/task/core/prune_all_forums.php @@ -37,9 +37,9 @@ class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base * @param string $phpbb_root_path The root path * @param string $php_ext The PHP extension * @param phpbb_config $config The config - * @param dbal $db The db connection + * @param phpbb_db_driver $db The db connection */ - public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, dbal $db) + public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; diff --git a/phpBB/includes/cron/task/core/prune_forum.php b/phpBB/includes/cron/task/core/prune_forum.php index fa7a761d88..e3c497f072 100644 --- a/phpBB/includes/cron/task/core/prune_forum.php +++ b/phpBB/includes/cron/task/core/prune_forum.php @@ -47,9 +47,9 @@ class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements p * @param string $phpbb_root_path The root path * @param string $php_ext The PHP extension * @param phpbb_config $config The config - * @param dbal $db The db connection + * @param phpbb_db_driver $db The db connection */ - public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, dbal $db) + public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; diff --git a/phpBB/includes/cron/task/core/tidy_search.php b/phpBB/includes/cron/task/core/tidy_search.php index fdbe31346e..3ec25aa021 100644 --- a/phpBB/includes/cron/task/core/tidy_search.php +++ b/phpBB/includes/cron/task/core/tidy_search.php @@ -38,10 +38,10 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base * @param string $php_ext The PHP extension * @param phpbb_auth $auth The auth * @param phpbb_config $config The config - * @param dbal $db The db connection + * @param phpbb_db_driver $db The db connection * @param phpbb_user $user The user */ - public function __construct($phpbb_root_path, $php_ext, phpbb_auth $auth, phpbb_config $config, dbal $db, phpbb_user $user) + public function __construct($phpbb_root_path, $php_ext, phpbb_auth $auth, phpbb_config $config, phpbb_db_driver $db, phpbb_user $user) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; |