Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into install_master

  • Loading branch information...
commit caea6920a14b265d259b5f7939a71cf897ab06cf 2 parents 6f7a109 + ecfe814
AMOS bot authored
2  cache/classes/config.php
View
@@ -170,7 +170,7 @@ public function load() {
$plugin = $store['plugin'];
$class = 'cachestore_'.$plugin;
$exists = array_key_exists($plugin, $availableplugins);
- if (!$exists && (!class_exists($class) || !is_subclass_of($class, 'cache_store'))) {
+ if (!$exists) {
// Not a valid plugin, or has been uninstalled, just skip it an carry on.
debugging('Invalid cache store in config. Not an available plugin.', DEBUG_DEVELOPER);
continue;
2  cache/classes/loaders.php
View
@@ -40,7 +40,7 @@
* @copyright 2012 Sam Hemelryk
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class cache implements cache_loader, cache_is_key_aware {
+class cache implements cache_loader {
/**
* We need a timestamp to use within the cache API.
5 cache/locallib.php
View
@@ -136,7 +136,8 @@ public function add_store_instance($name, $plugin, array $configuration = array(
throw new cache_exception('Invalid cache plugin specified. The plugin does not contain the required class.');
}
}
- if (!is_subclass_of($class, 'cache_store')) {
+ $reflection = new ReflectionClass($class);
+ if (!$reflection->implementsInterface('cache_store')) {
throw new cache_exception('Invalid cache plugin specified. The plugin does not extend the required class.');
}
if (!$class::are_requirements_met()) {
@@ -400,7 +401,7 @@ protected static function locate_definitions() {
$definition['component'] = $component;
$definition['area'] = $area;
if (array_key_exists($id, $definitions)) {
- debugging('Error: duplicate cache definition found with name '.$name, DEBUG_DEVELOPER);
+ debugging('Error: duplicate cache definition found with id: '.$id, DEBUG_DEVELOPER);
continue;
}
$definitions[$id] = $definition;
4 version.php
View
@@ -30,11 +30,11 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2012101400.00; // YYYYMMDD = weekly release date of this DEV branch
+$version = 2012101500.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
-$release = '2.4dev (Build: 20121014)'; // Human-friendly version name
+$release = '2.4dev (Build: 20121015)'; // Human-friendly version name
$branch = '24'; // this version's branch
$maturity = MATURITY_ALPHA; // this version's maturity level
Please sign in to comment.
Something went wrong with that request. Please try again.