Merge branch 'MDL-53256-m30' of https://github.com/micaherne/moodle into MOODLE_30_STABLE

2016-04-04 19:02:53 +02:00
parent 63a1a289e9 ad23f18a40
commit f80a695b4c
1 changed files with 5 additions and 1 deletions
@@ -330,7 +330,11 @@ class cache_config {
        if (!file_exists($cachefile)) {
            throw new cache_exception('Default cache config could not be found. It should have already been created by now.');
        }
-        include($cachefile);
+
+        if (!include($cachefile)) {
+            throw new cache_exception('Unable to load the cache configuration file');
+        }
+
        if (!is_array($configuration)) {
            throw new cache_exception('Invalid cache configuration file');
        }