From eb1ce7819a16e9b780e1272e405950817d1de6dc Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Mon, 20 Jun 2011 21:01:34 +0200
Subject: [PATCH] Fix linkTo()
---
lib/helper.php | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/helper.php b/lib/helper.php
index 6f7d7ce251e..8cd6ebf75a5 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -37,17 +37,24 @@ class OC_HELPER {
global $WEBROOT;
global $SERVERROOT;
- if(!empty($app)) {
+ if( $app != '' ){
$app .= '/';
// Check if the app is in the app folder
- if( file_exists( $SERVERROOT . '/apps/'. $app )){
+ if( file_exists( $SERVERROOT . '/apps/'. $app.$file )){
return $WEBROOT . '/apps/' . $app . $file;
}
+ else{
+ return $WEBROOT . '/' . $app . $file;
+ }
}
else{
- $app = 'core';
+ if( file_exists( $SERVERROOT . '/core/'. $file )){
+ return $WEBROOT . '/core/'.$file;
+ }
+ else{
+ return $WEBROOT . '/'.$file;
+ }
}
- return $WEBROOT . '/' . $app . $file;
}
/**
--
GitLab