Merge pull request #2120 from owncloud/clear-caches
Clear the CSS and JS cache earlier to make sure update goes smoothly
This commit is contained in:
commit
145fb18042
|
@ -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
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue