diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-07 19:22:43 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-07 19:22:43 +0000 |
| commit | 9f1c46b6f6faebaebf555e0d26bcdef9e49daccc (patch) | |
| tree | e68c2955892ccc85af12f1dacfd0b9dccbdb65eb /lib/minimizer | |
| parent | 0f7fdd414896ddfd1a5cd600d982f38c2b926ed8 (diff) | |
| download | nextcloud-server-9f1c46b6f6faebaebf555e0d26bcdef9e49daccc.tar.gz nextcloud-server-9f1c46b6f6faebaebf555e0d26bcdef9e49daccc.zip | |
Correct Minizer inclusions
Diffstat (limited to 'lib/minimizer')
| -rw-r--r-- | lib/minimizer/css.php | 4 | ||||
| -rw-r--r-- | 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 76dc99b335b..5ba557c4cdc 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 aea8b66f912..4002b11538f 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); |