diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 15:19:27 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 15:19:27 +0200 |
| commit | ebcaa46482860e944a21bb2c81bf3d3581adbba8 (patch) | |
| tree | 184370fcaf8694ef5a14e74886878dd96b49218b | |
| parent | 3f64eb25ab89964127681a52265207dbeb7e1e9b (diff) | |
| download | nextcloud-server-ebcaa46482860e944a21bb2c81bf3d3581adbba8.tar.gz nextcloud-server-ebcaa46482860e944a21bb2c81bf3d3581adbba8.zip | |
fix loading of css files that are core related
| -rw-r--r-- | core/templates/layout.guest.php | 1 | ||||
| -rw-r--r-- | lib/template.php | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 2bd2e20df70..7ba7abdbf12 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -9,6 +9,7 @@ <?php endforeach; ?> <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; + var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; </script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> diff --git a/lib/template.php b/lib/template.php index eccf011e8d2..57e9c15f5e6 100644 --- a/lib/template.php +++ b/lib/template.php @@ -323,11 +323,11 @@ class OC_Template{ */ public function appendIfExist($type, $root, $web, $file) { if (is_file($root.'/'.$file)) { - if($type == 'cssfiles' && $root == OC::$APPSROOT){ - $pathes = explode('/', $file); - $app = $pathes['1']; - unset($pathes['0']); - unset($pathes['1']); + $pathes = explode('/', $file); + if($type == 'cssfiles' && $root == OC::$APPSROOT && $pathes[0] == 'apps'){ + $app = $pathes[1]; + unset($pathes[0]); + unset($pathes[1]); $path = implode('/', $pathes); $this->append( $type, OC_Helper::linkTo($app, $path)); }else{ |