diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-07 20:36:55 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-07 20:36:55 +0000 |
| commit | 9ec68c819bf409905e3e3ab17cb4b2dd925cbde7 (patch) | |
| tree | fd115646b7a23b5d615949aea9cc8b84e8d9b83d /lib/minimizer | |
| parent | 9f1c46b6f6faebaebf555e0d26bcdef9e49daccc (diff) | |
| download | nextcloud-server-9ec68c819bf409905e3e3ab17cb4b2dd925cbde7.tar.gz nextcloud-server-9ec68c819bf409905e3e3ab17cb4b2dd925cbde7.zip | |
Change parameter 'web' to 'url' and take array of array in config instead of : separated values
Diffstat (limited to 'lib/minimizer')
| -rw-r--r-- | lib/minimizer/css.php | 6 | ||||
| -rw-r--r-- | lib/minimizer/js.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php index 5ba557c4cdc..c7e5d96e06b 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($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($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$style$fext.css", true)) { $append =true; break; } + elseif($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$style.css", true )) { $append =true; break; } } if(! $append) { echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); @@ -65,7 +65,7 @@ class OC_Minimizer_CSS extends OC_Minimizer $in_root = false; foreach(OC::$APPSROOTS as $app_root) { if(strpos($file, $app_root['path']) == 0) { - $in_root = $app_root['web']; + $in_root = $app_root['url']; break; } } diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php index 4002b11538f..dd7d15de061 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($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($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$script$fext.js" , true)) { $append =true; break; } + elseif($this->appendIfExist($apps_dir['path'], $apps_dir['url'], "$script.js", true )) { $append =true; break; } } if(! $append) { echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); |