From 9f1c46b6f6faebaebf555e0d26bcdef9e49daccc Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 7 Jun 2012 19:22:43 +0000
Subject: [PATCH] Correct Minizer inclusions
---
lib/minimizer/css.php | 4 ++--
lib/minimizer/js.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 76dc99b335..5ba557c4cd 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -28,8 +28,8 @@ class OC_Minimizer_CSS extends OC_Minimizer
$append = false;
foreach( OC::$APPSROOTS as $apps_dir)
{
- if($this->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; }
- elseif($this->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
+ if($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; }
+ elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
}
if(! $append) {
echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
index aea8b66f91..4002b11538 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -42,8 +42,8 @@ class OC_Minimizer_JS extends OC_Minimizer
$append = false;
foreach( OC::$APPSROOTS as $apps_dir)
{
- if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; }
- elseif($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
+ if($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; }
+ elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
}
if(! $append) {
echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
--
GitLab