aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-06-07 21:33:30 +0000
committerplegall <plg@piwigo.org>2012-06-07 21:33:30 +0000
commit1808c59fd6379138f57b64a76f24df78f887562e (patch)
treee837e0bd49015efcc04874055dd340f4e2fc83f2 /include
parent8bb75437f76ea2bcfc6af6fc9521380a233f55f0 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/common.inc.php6
1 files changed, 5 insertions, 1 deletions
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 );
}