apps are now stored in /apps

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/helper.php b/lib/helper.php
index a10697c3933..982da7b6cc3 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -35,6 +35,12 @@ class OC_HELPER {
 	 */
 	public static function linkTo( $app, $file ){
 		global $WEBROOT;
+		global $SERVERROOT;
+
+		// Check if the app is in the app folder
+		if( file_exists( "$SERVERROOT/apps/$app/$file" )){
+			return "$WEBROOT/apps/$app/$file";
+		}
 		return "$WEBROOT/$app/$file";
 	}
 
@@ -47,7 +53,12 @@ class OC_HELPER {
 	 * Returns the path to the image.
 	 */
 	public static function imagePath( $app, $image ){
+		global $SERVERROOT;
 		global $WEBROOT;
+		// Check if the app is in the app folder
+		if( file_exists( "$SERVERROOT/apps/img/$app/$file" )){
+			return "$WEBROOT/apps/img/$app/$file";
+		}
 		return "$WEBROOT/$app/img/$image";
 	}