diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-03 21:13:30 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-06 20:24:15 +0000 |
| commit | cc494259d3e1fc60e82452dfdc1d0e0e0cd848e9 (patch) | |
| tree | 5eb8dba209fc57625793487745d42515242fe1ee /lib/template.php | |
| parent | 6832aec60fcdcc7e8b6433d8f9103cdf347f32ed (diff) | |
| download | nextcloud-server-cc494259d3e1fc60e82452dfdc1d0e0e0cd848e9.tar.gz nextcloud-server-cc494259d3e1fc60e82452dfdc1d0e0e0cd848e9.zip | |
Unit path and webpath, correct some more
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 a354d58a4b1..e6525ec6336 100644 --- a/lib/template.php +++ b/lib/template.php @@ -415,8 +415,8 @@ class OC_Template{ $append = false; foreach( OC::$APPSROOTS as $apps_dir) { - if($page->appendIfExist('jsfiles', $apps_dir, OC::$APPSWEBROOT.'/apps/', "$script$fext.js" , true)) { $append =true; break; } - elseif($page->appendIfExist('jsfiles', $apps_dir, OC::$APPSWEBROOT.'/apps/', "$script.js", true )) { $append =true; break; } + 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(! $append) { echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); @@ -443,8 +443,8 @@ class OC_Template{ $append = false; foreach( OC::$APPSROOTS as $apps_dir) { - if($page->appendIfExist('cssfiles', $apps_dir, OC::$APPSWEBROOT, "$style$fext.css", true)) { $append =true; break; } - elseif($page->appendIfExist('cssfiles', $apps_dir, OC::$APPSWEBROOT, "$style.css", true )) { $append =true; break; } + 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(! $append) { echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); |