diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-06 02:53:16 -0800 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-06 02:53:16 -0800 |
| commit | 145fb1804256b30a0df46914d0a461ba77b74317 (patch) | |
| tree | 0a458c22e0dc892ff53246c65ff04c639aa49cc3 | |
| parent | d9a0d1d23b568a8ea520a00936850b69c2330a52 (diff) | |
| parent | 5300d6ad552585a316107cb483bd68533116d392 (diff) | |
| download | nextcloud-server-145fb1804256b30a0df46914d0a461ba77b74317.tar.gz nextcloud-server-145fb1804256b30a0df46914d0a461ba77b74317.zip | |
Merge pull request #2120 from owncloud/clear-caches
Clear the CSS and JS cache earlier to make sure update goes smoothly
| -rw-r--r-- | core/ajax/update.php | 4 | ||||
| -rw-r--r-- | lib/base.php | 4 |
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()); |