From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 22 Apr 2011 15:14:49 +0000 (+0200)
Subject: properly load css and js files for apps
X-Git-Tag: v3.0~267^2~558^2~34^2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3e47ce3cef71306921f05fce9bdf19cceaf1c2a8;p=nextcloud-server.git

properly load css and js files for apps
---

diff --git a/lib/template.php b/lib/template.php
index dd1943ae7f5..cdd8f2fb32f 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -181,6 +181,7 @@ class OC_TEMPLATE{
 	{
 		// global Data we need
 		global $WEBROOT;
+		global $SERVERROOT;
 		$data = $this->_fetch();
 
 		if( $this->renderas )
@@ -211,10 +212,18 @@ class OC_TEMPLATE{
 
 			// Add the css and js files
 			foreach(OC_UTIL::$scripts as $script){
-				$page->append( "jsfiles", "$WEBROOT/$script.js" );
+				if(is_file("$SERVERROOT/apps/$script.js" )){
+					$page->append( "jsfiles", "$WEBROOT/apps/$script.js" );
+				}else{
+					$page->append( "jsfiles", "$WEBROOT/$script.js" );
+				}
 			}
 			foreach(OC_UTIL::$styles as $style){
-				$page->append( "cssfiles", "$WEBROOT/$style.css" );
+				if(is_file("$SERVERROOT/apps/$style.js" )){
+					$page->append( "cssfiles", "$WEBROOT/apps/$style.css" );
+				}else{
+					$page->append( "cssfiles", "$WEBROOT/$style.css" );
+				}
 			}
 
 			// Add css files and js files