Fix linkTo()

diff --git a/lib/helper.php b/lib/helper.php
index 6f7d7ce251e25a9c74d3de64296c9e630e8cbe26..8cd6ebf75a54e8a7ea117160a97888f65e9d8fef 100644 (file)
--- 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;
        }
 
        /**