summaryrefslogtreecommitdiffstats
path: root/lib/private/template.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/template.php')
-rw-r--r--lib/private/template.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/template.php b/lib/private/template.php
index 78ebb506385..d407eb8384c 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -233,13 +233,14 @@ class OC_Template extends \OC\Template\Base {
*/
public static function isAssetPipelineEnabled() {
// asset management enabled?
- $useAssetPipeline = \OC::$server->getConfig()->getSystemValue('asset-pipeline.enabled', false);
+ $config = \OC::$server->getConfig();
+ $useAssetPipeline = $config->getSystemValue('asset-pipeline.enabled', false);
if (!$useAssetPipeline) {
return false;
}
// assets folder exists?
- $assetDir = \OC::$SERVERROOT . '/assets';
+ $assetDir = $config->getSystemValue('assetdirectory', \OC::$SERVERROOT) . '/assets';
if (!is_dir($assetDir)) {
if (!mkdir($assetDir)) {
\OCP\Util::writeLog('assets',