From ebcaa46482860e944a21bb2c81bf3d3581adbba8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Apr 2012 15:19:27 +0200
Subject: [PATCH] fix loading of css files that are core related
---
core/templates/layout.guest.php | 1 +
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 2bd2e20df7..7ba7abdbf1 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 eccf011e8d..57e9c15f5e 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{
--
GitLab