Merge branch 'ticket/11257' of github.com:EXreaction/phpbb3 into ticket/11103

This commit is contained in:
Nathan Guse 2012-12-08 17:33:40 -06:00
commit 53decec6e3
2 changed files with 17 additions and 1 deletions

View file

@ -6,6 +6,8 @@ services:
- %core.php_ext% - %core.php_ext%
- @config - @config
- @dbal.conn - @dbal.conn
calls:
- [set_name, [cron.task.core.prune_all_forums]]
tags: tags:
- { name: cron.task } - { name: cron.task }
@ -16,6 +18,8 @@ services:
- %core.php_ext% - %core.php_ext%
- @config - @config
- @dbal.conn - @dbal.conn
calls:
- [set_name, [cron.task.core.prune_forum]]
tags: tags:
- { name: cron.task } - { name: cron.task }
@ -25,6 +29,8 @@ services:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
- @config - @config
calls:
- [set_name, [cron.task.core.queue]]
tags: tags:
- { name: cron.task } - { name: cron.task }
@ -33,6 +39,8 @@ services:
arguments: arguments:
- @config - @config
- @cache.driver - @cache.driver
calls:
- [set_name, [cron.task.core.tidy_cache]]
tags: tags:
- { name: cron.task } - { name: cron.task }
@ -42,6 +50,8 @@ services:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
- @config - @config
calls:
- [set_name, [cron.task.core.tidy_database]]
tags: tags:
- { name: cron.task } - { name: cron.task }
@ -54,6 +64,8 @@ services:
- @config - @config
- @dbal.conn - @dbal.conn
- @user - @user
calls:
- [set_name, [cron.task.core.tidy_search]]
tags: tags:
- { name: cron.task } - { name: cron.task }
@ -62,6 +74,8 @@ services:
arguments: arguments:
- @config - @config
- @user - @user
calls:
- [set_name, [cron.task.core.tidy_sessions]]
tags: tags:
- { name: cron.task } - { name: cron.task }
@ -71,5 +85,7 @@ services:
- %core.root_path% - %core.root_path%
- %core.php_ext% - %core.php_ext%
- @config - @config
calls:
- [set_name, [cron.task.core.tidy_warnings]]
tags: tags:
- { name: cron.task } - { name: cron.task }

View file

@ -43,7 +43,7 @@ class phpbb_di_service_collection extends ArrayObject
public function add($name) public function add($name)
{ {
$task = $this->container->get($name); $task = $this->container->get($name);
$task->set_name($name);
$this->offsetSet($name, $task); $this->offsetSet($name, $task);
} }
} }