L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into install_master

Browse Source
This commit is contained in:
AMOS bot
2012-10-16 00:34:54 +00:00
parent 6f7a109f21 ecfe814e0f
commit caea6920a1
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cache/classes/config.php
Vendored
+1 -1
View File
@@ -170,7 +170,7 @@ class cache_config {
$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;
cache/classes/loaders.php
Vendored
+1 -1
View File
@@ -40,7 +40,7 @@ defined('MOODLE_INTERNAL') || die();
* @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.
cache/locallib.php
Vendored
+3 -2
View File
@@ -136,7 +136,8 @@ class cache_config_writer extends cache_config {
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 @@ class cache_config_writer extends cache_config {
$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;
version.php
+2 -2
View File
@@ -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