From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 19 Apr 2013 14:08:43 +0000 (+0200)
Subject: Simplify app js locating for layout pages
X-Git-Tag: v6.0.0alpha2~842^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b46f6e4f9792f652666fa8ccbb83eaa0dbb6a1ce;p=nextcloud-server.git

Simplify app js locating for layout pages
---

diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 92837658a5f..686a38a7386 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -173,18 +173,15 @@ class OC_TemplateLayout extends OC_Template {
 
 			}else{
 				// Is it part of an app?
-				$append = false;
-				foreach( OC::$APPSROOTS as $apps_dir) {
-					if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) {
-						$append = true;
-						break;
-					}
-					elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) {
-						$append = true;
-						break;
-					}
+				$app = substr($script, 0, strpos($script, '/'));
+				$script = substr($script, strpos($script, '/')+1);
+				$app_path = OC_App::getAppPath($app);
+				$app_url = OC_App::getAppWebPath($app);
+				if(self::appendIfExist($files, $app_path, $app_url, "$script$fext.js")) {
+				}
+				elseif(self::appendIfExist($files, $app_path, $app_url, "$script.js")) {
 				}
-				if(! $append) {
+				else {
 					echo('js file not found: script:'.$script.' formfactor:'.$fext
 						.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
 					die();