diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-04 19:52:44 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-06 20:24:15 +0000 |
| commit | 6a250d0d20c92513a883a7103885712127b51cc8 (patch) | |
| tree | f9769cf9e19a04500aaf78fe214228fc7bc2f935 /lib/template.php | |
| parent | cc494259d3e1fc60e82452dfdc1d0e0e0cd848e9 (diff) | |
| download | nextcloud-server-6a250d0d20c92513a883a7103885712127b51cc8.tar.gz nextcloud-server-6a250d0d20c92513a883a7103885712127b51cc8.zip | |
Correct css file inclusion
Diffstat (limited to 'lib/template.php')
| -rw-r--r-- | lib/template.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/template.php b/lib/template.php index e6525ec6336..fdd608fdc7a 100644 --- a/lib/template.php +++ b/lib/template.php @@ -329,10 +329,16 @@ class OC_Template{ if (is_file($root.'/'.$file)) { $pathes = explode('/', $file); - if($type == 'cssfiles' && $root == OC::$APPSROOTS[0] && $in_app){ + $in_root = false; + foreach(OC::$APPSROOTS as $app_root) { + if($root == $app_root['path']) { + $in_root = true; + break; + } + } + if($type == 'cssfiles' && $in_root && $in_app){ $app = $pathes[0]; unset($pathes[0]); -// unset($pathes[1]); $path = implode('/', $pathes); $this->append( $type, OC_Helper::linkTo($app, $path)); }else{ |