aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-12-08 17:33:40 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2012-12-08 17:33:40 -0600
commit53decec6e315552e8492fcab3c84f68b33f0782e (patch)
tree909733c1ced9f6f56681c0f495c971f68e9953b5 /phpBB
parentc0534f9e5d1527426f5a80276cf8a08323334ef1 (diff)
parent8a28271dd500b3623e1402339252504468e567f6 (diff)
downloadforums-53decec6e315552e8492fcab3c84f68b33f0782e.tar
forums-53decec6e315552e8492fcab3c84f68b33f0782e.tar.gz
forums-53decec6e315552e8492fcab3c84f68b33f0782e.tar.bz2
forums-53decec6e315552e8492fcab3c84f68b33f0782e.tar.xz
forums-53decec6e315552e8492fcab3c84f68b33f0782e.zip
Merge branch 'ticket/11257' of github.com:EXreaction/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/config/cron_tasks.yml16
-rw-r--r--phpBB/includes/di/service_collection.php2
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);
}
}