diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-12-09 19:02:04 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-12-09 19:02:04 +0100 |
| commit | 3fe381eed561e724700b21789e28ea3efb1f7ef9 (patch) | |
| tree | 59f9b64980ba09ce14cf4ac71195f7462386ea97 | |
| parent | bd987b6e14ffc134f1c1972e3c0fb3b0a19e09b2 (diff) | |
| parent | 8a28271dd500b3623e1402339252504468e567f6 (diff) | |
| download | forums-3fe381eed561e724700b21789e28ea3efb1f7ef9.tar forums-3fe381eed561e724700b21789e28ea3efb1f7ef9.tar.gz forums-3fe381eed561e724700b21789e28ea3efb1f7ef9.tar.bz2 forums-3fe381eed561e724700b21789e28ea3efb1f7ef9.tar.xz forums-3fe381eed561e724700b21789e28ea3efb1f7ef9.zip | |
Merge remote-tracking branch 'exreaction/ticket/11257' into develop
* exreaction/ticket/11257:
[ticket/11257] Do not require set_name() method to exist
| -rw-r--r-- | phpBB/config/cron_tasks.yml | 16 | ||||
| -rw-r--r-- | phpBB/includes/di/service_collection.php | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/phpBB/config/cron_tasks.yml b/phpBB/config/cron_tasks.yml index 74f57e449d..d1954b1877 100644 --- a/phpBB/config/cron_tasks.yml +++ b/phpBB/config/cron_tasks.yml @@ -6,6 +6,8 @@ services: - %core.php_ext% - @config - @dbal.conn + calls: + - [set_name, [cron.task.core.prune_all_forums]] tags: - { name: cron.task } @@ -16,6 +18,8 @@ services: - %core.php_ext% - @config - @dbal.conn + calls: + - [set_name, [cron.task.core.prune_forum]] tags: - { name: cron.task } @@ -25,6 +29,8 @@ services: - %core.root_path% - %core.php_ext% - @config + calls: + - [set_name, [cron.task.core.queue]] tags: - { name: cron.task } @@ -33,6 +39,8 @@ services: arguments: - @config - @cache.driver + calls: + - [set_name, [cron.task.core.tidy_cache]] tags: - { name: cron.task } @@ -42,6 +50,8 @@ services: - %core.root_path% - %core.php_ext% - @config + calls: + - [set_name, [cron.task.core.tidy_database]] tags: - { name: cron.task } @@ -54,6 +64,8 @@ services: - @config - @dbal.conn - @user + calls: + - [set_name, [cron.task.core.tidy_search]] tags: - { name: cron.task } @@ -62,6 +74,8 @@ services: arguments: - @config - @user + calls: + - [set_name, [cron.task.core.tidy_sessions]] tags: - { name: cron.task } @@ -71,5 +85,7 @@ services: - %core.root_path% - %core.php_ext% - @config + calls: + - [set_name, [cron.task.core.tidy_warnings]] tags: - { name: cron.task } diff --git a/phpBB/includes/di/service_collection.php b/phpBB/includes/di/service_collection.php index 60323c8dba..880cb46d4d 100644 --- a/phpBB/includes/di/service_collection.php +++ b/phpBB/includes/di/service_collection.php @@ -43,7 +43,7 @@ class phpbb_di_service_collection extends ArrayObject public function add($name) { $task = $this->container->get($name); - $task->set_name($name); + $this->offsetSet($name, $task); } } |