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

…nto MOODLE_30_STABLE
moodle · Apr 4, 2016 · f80a695 · f80a695
2 parents 63a1a28 + ad23f18
commit f80a695
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cache/classes/config.php b/cache/classes/config.php
@@ -330,7 +330,11 @@ protected function include_configuration() {
         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');
         }