From 3e47ce3cef71306921f05fce9bdf19cceaf1c2a8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 22 Apr 2011 17:14:49 +0200 Subject: [PATCH] properly load css and js files for apps --- lib/template.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 -- 2.39.5