diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-12-28 10:28:16 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-01-03 22:05:02 +0100 |
| commit | a46d45a652b60cb2bcbb9261db864589bdd1689b (patch) | |
| tree | 94168bb21427a44925a1e5bba838ca6658410ea8 /lib/private/Template | |
| parent | 89b6bc9424060e72abaf5b20a5ca531aca74c03f (diff) | |
| download | nextcloud-server-a46d45a652b60cb2bcbb9261db864589bdd1689b.tar.gz nextcloud-server-a46d45a652b60cb2bcbb9261db864589bdd1689b.zip | |
Fixup! getWebdir return
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib/private/Template')
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index 8da4d51b749..2f63b425a1e 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -316,12 +316,8 @@ class SCSSCacher { * @return string the webDir */ private function getWebDir($path, $app) { - // Detect if path is within server root - if(strpos($path, $this->serverRoot) > -1) { - return \OC::$WEBROOT.substr($path, strlen($this->serverRoot)); - } - // Detect if path is within an app path - if($appWebPath = \OC_App::getAppWebPath($app)) { + // Detect if path is within server root AND if path is within an app path + if ( strpos($path, $this->serverRoot) === -1 && $appWebPath = \OC_App::getAppWebPath($app) ) { // Get the file path within the app directory $appDirectoryPath = explode($app, $path)[1]; // Remove the webroot |