Merge pull request #20461 from owncloud/assetpipeline-on-upgrade

Do not use the asset pipeline when doing updates
This commit is contained in:
Thomas Müller 2015-11-12 08:51:30 +01:00
commit af05be1ac7
1 changed files with 11 additions and 0 deletions

View File

@ -379,6 +379,17 @@ class OC_Template extends \OC\Template\Base {
* @return bool
*/
public static function isAssetPipelineEnabled() {
try {
if (\OCP\Util::needUpgrade()) {
// Don't use the compiled asset when we need to do an update
return false;
}
} catch (\Exception $e) {
// Catch any exception, because this code is also called when displaying
// an exception error page.
return false;
}
// asset management enabled?
$config = \OC::$server->getConfig();
$useAssetPipeline = $config->getSystemValue('asset-pipeline.enabled', false);