1 files changed, 17 insertions, 36 deletions

diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
index 29f3efaa8da..d5e9ce732cc 100644
--- a/lib/private/Template/CSSResourceLocator.php
+++ b/lib/private/Template/CSSResourceLocator.php
@@ -6,6 +6,7 @@
  * @author Joas Schilling <coding@schilljs.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Kyle Fazzari <kyrofa@ubuntu.com>
  *
  * @license AGPL-3.0
  *
@@ -122,45 +123,25 @@ class CSSResourceLocator extends ResourceLocator {
 			parent::append($root, $file, $webRoot, $throw);
 		} else {
 			if (!$webRoot) {
-				$tmpRoot = realpath($root);
-				/*
-				 * traverse the potential web roots upwards in the path
-				 *
-				 * example:
-				 *   - root: /srv/www/apps/myapp
-				 *   - available mappings: ['/srv/www']
-				 *
-				 * First we check if a mapping for /srv/www/apps/myapp is available,
-				 * then /srv/www/apps, /srv/www/apps, /srv/www, ... until we find a
-				 * valid web root
-				 */
-				do {
-					if (isset($this->mapping[$tmpRoot])) {
-						$webRoot = $this->mapping[$tmpRoot];
-						break;
+				$webRoot = $this->findWebRoot($root);
+
+				if ($webRoot === null) {
+					$webRoot = '';
+					$this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
+						'app' => 'lib',
+						'root' => $root,
+						'file' => $file,
+						'webRoot' => $webRoot,
+						'throw' => $throw ? 'true' : 'false'
+					]);
+
+					if ($throw && $root === '/') {
+						throw new ResourceNotFoundException($file, $webRoot);
 					}
-
-					if ($tmpRoot === '/') {
-						$webRoot = '';
-						$this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
-							'app' => 'lib',
-							'root' => $root,
-							'file' => $file,
-							'webRoot' => $webRoot,
-							'throw' => $throw ? 'true' : 'false'
-						]);
-						break;
-					}
-					$tmpRoot = dirname($tmpRoot);
-				} while(true);
-
-			}
-
-			if ($throw && $tmpRoot === '/') {
-				throw new ResourceNotFoundException($file, $webRoot);
+				}
 			}
 
-			$this->resources[] = array($tmpRoot, $webRoot, $file);
+			$this->resources[] = array($webRoot? : '/', $webRoot, $file);
 		}
 	}
 }