aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions.inc.php
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2012-11-07 09:44:24 +0000
committerpatdenice <patdenice@piwigo.org>2012-11-07 09:44:24 +0000
commit5266cecfefd92a388d8a2d408b28e10f0d1c3d98 (patch)
treef5ad969e65264748d93d237349798815e81aefd5 /include/functions.inc.php
parentd7c75c190ab1bfc15ba5b717864992dce5232902 (diff)
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
Diffstat (limited to 'include/functions.inc.php')
-rw-r--r--include/functions.inc.php3
1 files changed, 1 insertions, 2 deletions
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
{