Skip to content
Snippets Groups Projects
Commit 9f1c46b6 authored by Brice Maron's avatar Brice Maron
Browse files

Correct Minizer inclusions

parent 0f7fdd41
No related branches found
No related tags found
No related merge requests found
...@@ -28,8 +28,8 @@ class OC_Minimizer_CSS extends OC_Minimizer ...@@ -28,8 +28,8 @@ class OC_Minimizer_CSS extends OC_Minimizer
$append = false; $append = false;
foreach( OC::$APPSROOTS as $apps_dir) foreach( OC::$APPSROOTS as $apps_dir)
{ {
if($this->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; } if($this->appendIfExist($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; } elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; }
} }
if(! $append) { if(! $append) {
echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
......
...@@ -42,8 +42,8 @@ class OC_Minimizer_JS extends OC_Minimizer ...@@ -42,8 +42,8 @@ class OC_Minimizer_JS extends OC_Minimizer
$append = false; $append = false;
foreach( OC::$APPSROOTS as $apps_dir) foreach( OC::$APPSROOTS as $apps_dir)
{ {
if($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['web'], "$script$fext.js" , true)) { $append =true; break; } if($this->appendIfExist($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; } elseif($this->appendIfExist($apps_dir['path'], $apps_dir['web'], "$script.js", true )) { $append =true; break; }
} }
if(! $append) { if(! $append) {
echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment