Skip to content
Permalink
Browse files

Merge branch 'wip-mdl-56348' of https://github.com/rajeshtaneja/moodle

  • Loading branch information...
stronk7 committed Oct 17, 2016
2 parents 3dd505a + ca9a79d commit b3a089e8645a72b3972261b387337e897afb4510
Showing with 6 additions and 4 deletions.
  1. +2 −2 cache/classes/factory.php
  2. +4 −2 cache/disabledlib.php
@@ -198,7 +198,7 @@ public function create_cache_from_definition($component, $area, array $identifie
}
$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 @@ public function create_cache_from_params($mode, $component, $area, array $identi
}
$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;
}
@@ -213,7 +213,8 @@ public function create_cache(cache_definition $definition) {
*/
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 @@ public function create_cache_from_definition($component, $area, array $identifie
*/
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;
}

0 comments on commit b3a089e

Please sign in to comment.
You can’t perform that action at this time.