aboutsummaryrefslogtreecommitdiffstats
path: root/lib/repair
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2014-12-30 12:03:07 -0800
committerAdam Williamson <awilliam@redhat.com>2015-01-05 15:24:23 -0800
commitbb79aac78a4c94c963c1995c5306be2acac64263 (patch)
tree80e6ceda42dba2a0cb326879b61d81d9d7815e99 /lib/repair
parentc0ad6e818b118a22c5312e6ded97ebb0eeee5cda (diff)
downloadnextcloud-server-bb79aac78a4c94c963c1995c5306be2acac64263.tar.gz
nextcloud-server-bb79aac78a4c94c963c1995c5306be2acac64263.zip
allow css/js asset directory to be relocated (#13053)
This allows the directory where CSS/JS asset collections are written to be changed, in case SERVERROOT is not writeable. Note it does *not* allow the expected URL to be changed: whatever directory is used, the server must be configured to serve it at WEBROOT/assets. It may be possible to add another config parameter to allow the admin to specify a custom asset URL, but I thought I'd keep the first implementation simple.
Diffstat (limited to 'lib/repair')
-rw-r--r--lib/repair/assetcache.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/repair/assetcache.php b/lib/repair/assetcache.php
index d7677a10d11..1bc2b91ad86 100644
--- a/lib/repair/assetcache.php
+++ b/lib/repair/assetcache.php
@@ -22,7 +22,7 @@ class AssetCache extends BasicEmitter implements \OC\RepairStep {
$this->emit('\OC\Repair', 'info', array('Asset pipeline disabled -> nothing to do'));
return;
}
- $assetDir = \OC::$SERVERROOT . '/assets';
+ $assetDir = \OC::$server->getConfig()->getSystemValue('assetdirectory', \OC::$SERVERROOT) . '/assets';
\OC_Helper::rmdirr($assetDir, false);
$this->emit('\OC\Repair', 'info', array('Asset cache cleared.'));
}