summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-03-05 21:13:07 -0500
committerMichael Gapczynski <mtgap@owncloud.com>2013-03-05 21:13:07 -0500
commit5300d6ad552585a316107cb483bd68533116d392 (patch)
tree723e4f806f7475921e9afc2547567594c8b68e0a
parentc1a32b50735b0a8558823d111e546865ddcba790 (diff)
downloadnextcloud-server-5300d6ad552585a316107cb483bd68533116d392.tar.gz
nextcloud-server-5300d6ad552585a316107cb483bd68533116d392.zip
Clear the CSS and JS cache earlier to make sure update goes smoothly
-rw-r--r--core/ajax/update.php4
-rw-r--r--lib/base.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index b112cf6266b..8b20150d432 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -17,10 +17,6 @@ if (OC::checkUpgrade(false)) {
} catch (Exception $exception) {
$watcher->failure($exception->getMessage());
}
- $minimizerCSS = new OC_Minimizer_CSS();
- $minimizerCSS->clearCache();
- $minimizerJS = new OC_Minimizer_JS();
- $minimizerJS->clearCache();
OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
OC_App::checkAppsRequirements();
// load all apps to also upgrade enabled apps
diff --git a/lib/base.php b/lib/base.php
index bffae36261e..59b861ffce1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -277,6 +277,10 @@ class OC {
OC_Log::write('core',
'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion,
OC_Log::DEBUG);
+ $minimizerCSS = new OC_Minimizer_CSS();
+ $minimizerCSS->clearCache();
+ $minimizerJS = new OC_Minimizer_JS();
+ $minimizerJS->clearCache();
OC_Util::addscript('update');
$tmpl = new OC_Template('', 'update', 'guest');
$tmpl->assign('version', OC_Util::getVersionString());