Correct Minizer inclusions
This commit is contained in:
parent
0f7fdd4148
commit
9f1c46b6f6
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue