MDL-36466 cache: disabled caching during installation and upgrade

diff --git a/admin/cli/install.php b/admin/cli/install.php
index 858571f..b662d4c 100644 (file)
--- a/admin/cli/install.php
+++ b/admin/cli/install.php
@@ -169,6 +169,9 @@ require_once($CFG->dirroot.'/cache/lib.php');
 require($CFG->dirroot.'/version.php');
 $CFG->target_release = $release;
 
+// Disable the cache API.
+cache_factory::disable();
+
 //Database types
 $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'native'),
                    'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),

diff --git a/admin/index.php b/admin/index.php
index bbd528d..6ce81f9 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -105,6 +105,9 @@ if (!$version or !$release) {
 }
 
 if (!core_tables_exist()) {
+    // Disable the Cache API as much as possible for installation.
+    cache_factory::disable();
+
     $PAGE->set_pagelayout('maintenance');
     $PAGE->set_popup_notification_allowed(false);
 
@@ -193,6 +196,10 @@ if (empty($CFG->version)) {
 
 if ($version > $CFG->version) {  // upgrade
     purge_all_caches();
+
+    // Disable the Cache API as much as possible for upgrade.
+    cache_factory::disable();
+
     $PAGE->set_pagelayout('maintenance');
     $PAGE->set_popup_notification_allowed(false);
 
@@ -297,6 +304,8 @@ if ($branch <> $CFG->branch) {  // Update the branch
 }
 
 if (moodle_needs_upgrading()) {
+    // Disable the Cache API as much as possible for upgrade.
+    cache_factory::disable();
     if (!$PAGE->headerprinted) {
         // means core upgrade or installation was not already done
         if (!$confirmplugins) {

diff --git a/install.php b/install.php
index e36c49b..fcaf485 100644 (file)
--- a/install.php
+++ b/install.php
@@ -220,6 +220,9 @@ $hint_dataroot = '';
 $hint_admindir = '';
 $hint_database = '';
 
+// Disable the cache API.
+cache_factory::disable();
+
 // Are we in help mode?
 if (isset($_GET['help'])) {
     install_print_help_page($_GET['help']);