mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Bernhard Posselt 2013-03-06 02:53:16 -08:00
parent d9a0d1d23b 5300d6ad55
commit 145fb18042
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/ajax/update.php
View File

@ -17,10 +17,6 @@ if (OC::checkUpgrade(false)) {
} catch (Exception $exception) { } catch (Exception $exception) {
$watcher->failure($exception->getMessage()); $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_Config::setValue('version', implode('.', OC_Util::getVersion()));
OC_App::checkAppsRequirements(); OC_App::checkAppsRequirements();
// load all apps to also upgrade enabled apps // load all apps to also upgrade enabled apps

4
lib/base.php
View File

@ -277,6 +277,10 @@ class OC {
OC_Log::write('core', OC_Log::write('core',
'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion,
OC_Log::DEBUG); OC_Log::DEBUG);
$minimizerCSS = new OC_Minimizer_CSS();
$minimizerCSS->clearCache();
$minimizerJS = new OC_Minimizer_JS();
$minimizerJS->clearCache();
OC_Util::addscript('update'); OC_Util::addscript('update');
$tmpl = new OC_Template('', 'update', 'guest'); $tmpl = new OC_Template('', 'update', 'guest');
$tmpl->assign('version', OC_Util::getVersionString()); $tmpl->assign('version', OC_Util::getVersionString());