From b98b56e4a8c92d56969806f62390d57d5986855a Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 24 Apr 2013 13:45:40 +0200
Subject: check if there is a default/ folder in the theme directory if no
 theme exists

---
 lib/helper.php         |  2 +-
 lib/template.php       |  2 +-
 lib/templatelayout.php |  4 ++--
 lib/util.php           | 21 +++++++++++++++++++++
 4 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/helper.php b/lib/helper.php
index 73484ad913f..2ba70294f4b 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -159,7 +159,7 @@ class OC_Helper {
 	 */
 	public static function imagePath( $app, $image ) {
 		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( "theme" );
+		$theme = OC_Util::getTheme();
 
 		// Check if the app is in the app folder
 		if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image" )) {
diff --git a/lib/template.php b/lib/template.php
index 434c1e9e990..f007618ff19 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -272,7 +272,7 @@ class OC_Template{
 	protected function findTemplate($name)
 	{
 		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( "theme" );
+		$theme = OC_Util::getTheme();
 
 		// Read the detected formfactor and use the right file name.
 		$fext = self::getFormFactorExtension();
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 69bebac0503..3c496f56e41 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -103,7 +103,7 @@ class OC_TemplateLayout extends OC_Template {
 
 	static public function findStylesheetFiles($styles) {
 		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( 'theme' );
+		$theme = OC_Util::getTheme();
 
 		// Read the detected formfactor and use the right file name.
 		$fext = self::getFormFactorExtension();
@@ -162,7 +162,7 @@ class OC_TemplateLayout extends OC_Template {
 
 	static public function findJavascriptFiles($scripts) {
 		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( 'theme' );
+		$theme = OC_Util::getTheme();
 
 		// Read the detected formfactor and use the right file name.
 		$fext = self::getFormFactorExtension();
diff --git a/lib/util.php b/lib/util.php
index 38453c1ce92..987a5782779 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -795,4 +795,25 @@ class OC_Util {
 		return (substr(PHP_OS, 0, 3) === "WIN");
 	}
 
+
+	/**
+	 * Handles the case that there may not be a theme, then check if a "default"
+	 * theme exists and take that one
+	 * @return string the theme
+	 */
+	public static function getTheme() {
+		$theme = OC_Config::getValue("theme");
+
+		if(is_null($theme)) {
+			
+			if(is_dir(__DIR__ . '/../themes/default')) {
+				$theme = 'default';
+			}
+
+		}
+
+		return $theme;
+	}
+
+
 }
-- 
cgit v1.2.3


From a8075943c3f425f3871faca9953bed3503573ef5 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 24 Apr 2013 14:17:52 +0200
Subject: use  variable instead of relative path to file

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/util.php b/lib/util.php
index 987a5782779..810593358a5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -806,7 +806,7 @@ class OC_Util {
 
 		if(is_null($theme)) {
 			
-			if(is_dir(__DIR__ . '/../themes/default')) {
+			if(is_dir(OC::$SERVERROOT . '/themes/default')) {
 				$theme = 'default';
 			}
 
-- 
cgit v1.2.3