From: Zach Prezkuta <fermion@gmx.com>
Date: Wed, 25 Jul 2012 00:13:19 +0000 (-0600)
Subject: use regular theme choosing logic if no mobile theme is specified
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=657347254f4764b06acae8b9bdb40829fb6b1c06;p=friendica.git

use regular theme choosing logic if no mobile theme is specified
---

diff --git a/boot.php b/boot.php
index 1dc3d8a9ac..f06cbe8499 100644
--- a/boot.php
+++ b/boot.php
@@ -1451,11 +1451,11 @@ if(! function_exists('current_theme')) {
 			$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
 			$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
 		}
-		else {
+		if(!$is_mobile || ($system_theme === '' && $theme_name === '')) {
 			$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
 			$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
 		}
-	
+
 		if($theme_name &&
 				(file_exists('view/theme/' . $theme_name . '/style.css') ||
 						file_exists('view/theme/' . $theme_name . '/style.php')))