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/template.php | |
| 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/template.php')
| -rw-r--r-- | lib/template.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/template.php b/lib/template.php index 6fe07102034..b99d492a536 100644 --- a/lib/template.php +++ b/lib/template.php @@ -426,8 +426,8 @@ class OC_Template{ $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($page->appendIfExist('jsfiles', $apps_dir['path'], $apps_dir['url'], "$script$fext.js" , true)) { $append =true; break; } + elseif($page->appendIfExist('jsfiles', $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); @@ -454,8 +454,8 @@ class OC_Template{ $append = false; foreach( OC::$APPSROOTS as $apps_dir) { - if($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style$fext.css", true)) { $append =true; break; } - elseif($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['web'], "$style.css", true )) { $append =true; break; } + if($page->appendIfExist('cssfiles', $apps_dir['path'], $apps_dir['url'], "$style$fext.css", true)) { $append =true; break; } + elseif($page->appendIfExist('cssfiles', $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); |