Merge "Bug 1737038: Only clear cache on update and not install"

dbe935e8 · Robert Lyon · Gerrit Code Review · 2593b87f · f5953a89 · dbe935e8
Commit dbe935e8 authored Jan 17, 2018 by Robert Lyon Committed by Gerrit Code Review Jan 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

htdocs/admin/upgrade.php htdocs/admin/upgrade.php +4 -2

No files found.
--- a/htdocs/admin/upgrade.php
+++ b/htdocs/admin/upgrade.php
@@ -98,8 +98,10 @@ $successicon = 'icon icon-check text-success left';
 $failureicon = 'icon icon-exclamation-triangle left';
 $warningicon = 'icon icon-exclamation-triangle left';

-// Clear all caches.
-clear_all_caches();
+if (empty($upgrades['core']->install)) {
+    // Clear all caches on upgrade
+    clear_all_caches();
+}

 $loadingstring = json_encode(get_string('upgradeloading', 'admin'));
 $installsuccessstring = json_encode(get_string('installsuccess', 'admin'));