From 5266cecfefd92a388d8a2d408b28e10f0d1c3d98 Mon Sep 17 00:00:00 2001 From: patdenice Date: Wed, 7 Nov 2012 09:44:24 +0000 Subject: merge r18967 from trunk to branch 2.4 bug:2687 bug:2778 Unable to switch from mobile theme to classic theme with incompatible plugins. Detect blackberry and symbian for mobile theme. Update mdetect class. git-svn-id: http://piwigo.org/svn/branches/2.4@18968 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/functions.inc.php') diff --git a/include/functions.inc.php b/include/functions.inc.php index 4e5c848e9..f0526c7a9 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -1671,7 +1671,7 @@ function get_device() { include_once(PHPWG_ROOT_PATH.'include/mdetect.php'); $uagent_obj = new uagent_info(); - if ($uagent_obj->DetectTierIphone()) + if ($uagent_obj->DetectSmartphone()) { $device = 'mobile'; } @@ -1705,7 +1705,6 @@ function mobile_theme() { $is_mobile_theme = get_boolean($_GET['mobile']); pwg_set_session_var('mobile_theme', $is_mobile_theme); - unset($_GET['mobile']); } else { -- cgit v1.2.3