From f36f453dd293a847978186ad7c920b14c4914373 Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Sat, 16 Apr 2011 09:46:58 +0200
Subject: apps are now stored in /apps

---
 lib/template.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/template.php')

diff --git a/lib/template.php b/lib/template.php
index 12a32c1f052..80bb4317d92 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -96,7 +96,13 @@ class OC_TEMPLATE{
 		// Get the right template folder
 		$template = "$SERVERROOT/templates/";
 		if( $app != "core" && $app != "" ){
-			$template = "$SERVERROOT/$app/templates/";
+			// Check if the app is in the app folder
+			if( "$SERVERROOT/apps/$app/templates/" ){
+				$template = "$SERVERROOT/apps/$app/templates/";
+			}
+			else{
+				$template = "$SERVERROOT/$app/templates/";
+			}
 		}
 
 		// Templates have the ending .php
-- 
cgit v1.2.3