upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fixup! getWebdir return

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2017-12-28 10:28:16 +01:00
parent dc938628f7
commit 88b72fd027
No known key found for this signature in database
GPG key ID: FB5ACEED51955BF8
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/Template/SCSSCacher.php
View file

@ -317,12 +317,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