From 1808c59fd6379138f57b64a76f24df78f887562e Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 7 Jun 2012 21:33:30 +0000
Subject: bug 2649: broken code commited in r15587, fixed with a simpler
 condition

git-svn-id: http://piwigo.org/svn/trunk@15597 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/common.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/common.inc.php b/include/common.inc.php
index 0fa06f679..49a46028c 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -192,7 +192,11 @@ if (defined('IN_ADMIN') and IN_ADMIN )
 }
 else
 { // Classic template
-  $theme = script_basename() != 'ws' and mobile_theme() ? $conf['mobile_theme'] : $user['theme'];
+  $theme = $user['theme'];
+  if (script_basename() != 'ws' and mobile_theme())
+  {
+    $theme = $conf['mobile_theme'];
+  }
   $template = new Template(PHPWG_ROOT_PATH.'themes', $theme );
 }
 
-- 
cgit v1.2.3