fix loading of css files that are core related

remotes/origin/stable4
Georg Ehrke 13 years ago
parent 3f64eb25ab
commit ebcaa46482
  1. 1
      core/templates/layout.guest.php
  2. 8
      lib/template.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>

@ -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']);
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{

Loading…
Cancel
Save