diff --git a/cache/classes/factory.php b/cache/classes/factory.php index d6d1637b341..ac20becfd5f 100644 --- a/cache/classes/factory.php +++ b/cache/classes/factory.php @@ -198,7 +198,7 @@ class cache_factory { } $definition = $this->create_definition($component, $area); $definition->set_identifiers($identifiers); - $cache = $this->create_cache($definition, $identifiers); + $cache = $this->create_cache($definition); // Loaders are always held onto to speed up subsequent requests. $this->cachesfromdefinitions[$definitionname] = $cache; return $cache; @@ -227,7 +227,7 @@ class cache_factory { } $definition = cache_definition::load_adhoc($mode, $component, $area, $options); $definition->set_identifiers($identifiers); - $cache = $this->create_cache($definition, $identifiers); + $cache = $this->create_cache($definition); $this->cachesfromparams[$key] = $cache; return $cache; } diff --git a/cache/disabledlib.php b/cache/disabledlib.php index fae2f357c83..565f27e14d6 100644 --- a/cache/disabledlib.php +++ b/cache/disabledlib.php @@ -213,7 +213,8 @@ class cache_factory_disabled extends cache_factory { */ public function create_cache_from_definition($component, $area, array $identifiers = array(), $unused = null) { $definition = $this->create_definition($component, $area); - $cache = $this->create_cache($definition, $identifiers); + $definition->set_identifiers($identifiers); + $cache = $this->create_cache($definition); return $cache; } @@ -233,7 +234,8 @@ class cache_factory_disabled extends cache_factory { */ public function create_cache_from_params($mode, $component, $area, array $identifiers = array(), array $options = array()) { $definition = cache_definition::load_adhoc($mode, $component, $area); - $cache = $this->create_cache($definition, $identifiers); + $definition->set_identifiers($identifiers); + $cache = $this->create_cache($definition); return $cache; }