diff options
author | Joas Schilling <nickvergessen@owncloud.com> | 2015-11-11 20:18:33 +0300 |
---|---|---|
committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-11-11 20:18:33 +0300 |
commit | c9753655dca9f3a50ae7556dee95f0d46f27bc90 (patch) | |
tree | 6fb4a33841cb4801f732d1b97ba2788bcfbbd6a2 /lib/private/template.php | |
parent | 960c8cb5bce4449834cf6373601e7555743cb89f (diff) |
Do not use the asset pipeline when doing updates
Diffstat (limited to 'lib/private/template.php')
-rw-r--r-- | lib/private/template.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/private/template.php b/lib/private/template.php index 38527cdc461..722194dc764 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -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); |