From 7b4d5af74d63412dbfbb1ece797496b001c12a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Thu, 8 Aug 2013 22:40:10 +0200
Subject: [PATCH] MDL-41094 purge caches only before and after upgrade of
 plugins

It should not be necessary to purge before/after individual plugins
because caches are disabled during install and upgrade.
---
 lib/upgradelib.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index f0fa0960121..84af15559a0 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -488,8 +488,6 @@ function upgrade_plugins($type, $startcallback, $endcallback, $verbose) {
                 message_update_processors($plug);
             }
             upgrade_plugin_mnet_functions($component);
-            cache_helper::purge_all(true);
-            purge_all_caches();
             $endcallback($component, true, $verbose);
 
         } else if ($installedversion < $plugin->version) { // upgrade
@@ -521,8 +519,6 @@ function upgrade_plugins($type, $startcallback, $endcallback, $verbose) {
                 message_update_processors($plug);
             }
             upgrade_plugin_mnet_functions($component);
-            cache_helper::purge_all(true);
-            purge_all_caches();
             $endcallback($component, false, $verbose);
 
         } else if ($installedversion > $plugin->version) {
@@ -653,7 +649,6 @@ function upgrade_plugins_modules($startcallback, $endcallback, $verbose) {
             message_update_providers($component);
             upgrade_plugin_mnet_functions($component);
 
-            purge_all_caches();
             $endcallback($component, true, $verbose);
 
         } else if ($currmodule->version < $module->version) {
@@ -687,8 +682,6 @@ function upgrade_plugins_modules($startcallback, $endcallback, $verbose) {
             message_update_providers($component);
             upgrade_plugin_mnet_functions($component);
 
-            purge_all_caches();
-
             $endcallback($component, false, $verbose);
 
         } else if ($currmodule->version > $module->version) {
@@ -844,7 +837,6 @@ function upgrade_plugins_blocks($startcallback, $endcallback, $verbose) {
             message_update_providers($component);
             upgrade_plugin_mnet_functions($component);
 
-            purge_all_caches();
             $endcallback($component, true, $verbose);
 
         } else if ($currblock->version < $block->version) {
@@ -877,7 +869,6 @@ function upgrade_plugins_blocks($startcallback, $endcallback, $verbose) {
             message_update_providers($component);
             upgrade_plugin_mnet_functions($component);
 
-            purge_all_caches();
             $endcallback($component, false, $verbose);
 
         } else if ($currblock->version > $block->version) {
@@ -1526,9 +1517,9 @@ function upgrade_core($version, $verbose) {
     require_once($CFG->libdir.'/db/upgrade.php');    // Defines upgrades
 
     try {
-        // Reset caches before any output
-        purge_all_caches();
+        // Reset caches before any output.
         cache_helper::purge_all(true);
+        purge_all_caches();
 
         // Upgrade current language pack if we can
         upgrade_language_pack();
@@ -1560,8 +1551,8 @@ function upgrade_core($version, $verbose) {
         cache_helper::update_definitions(true);
 
         // Purge caches again, just to be sure we arn't holding onto old stuff now.
-        purge_all_caches();
         cache_helper::purge_all(true);
+        purge_all_caches();
 
         // Clean up contexts - more and more stuff depends on existence of paths and contexts
         context_helper::cleanup_instances();
@@ -1588,6 +1579,10 @@ function upgrade_noncore($verbose) {
 
     // upgrade all plugins types
     try {
+        // Reset caches before any output.
+        cache_helper::purge_all(true);
+        purge_all_caches();
+
         $plugintypes = core_component::get_plugin_types();
         foreach ($plugintypes as $type=>$location) {
             upgrade_plugins($type, 'print_upgrade_part_start', 'print_upgrade_part_end', $verbose);
@@ -1596,6 +1591,11 @@ function upgrade_noncore($verbose) {
         cache_helper::update_definitions();
         // Mark the site as upgraded.
         set_config('allversionshash', core_component::get_all_versions_hash());
+
+        // Purge caches again, just to be sure we arn't holding onto old stuff now.
+        cache_helper::purge_all(true);
+        purge_all_caches();
+
     } catch (Exception $ex) {
         upgrade_handle_exception($ex);
     }