Commit af05be1a authored by Thomas Müller's avatar Thomas Müller
Browse files

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

Do not use the asset pipeline when doing updates
parents 9145aa60 c9753655
......@@ -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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment