From 2a62a0c3c5022e092f88046a73254bf52dc1adf3 Mon Sep 17 00:00:00 2001 From: misol Date: Sat, 21 Apr 2012 16:28:33 +0000 Subject: [PATCH] Issue 1774, remove android tablet check. (There is no significant check value.) git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10589 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/mobile/Mobile.class.php | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/classes/mobile/Mobile.class.php b/classes/mobile/Mobile.class.php index 81051081f..aac5b75ae 100644 --- a/classes/mobile/Mobile.class.php +++ b/classes/mobile/Mobile.class.php @@ -128,25 +128,14 @@ class Mobile { { static $UACheck; if(isset($UACheck)) return $UACheck; - $padAgent = array('iPad','Android','webOS','hp-tablet','PlayBook'); - - // Android with 'Mobile' string is not a tablet-like device, and 'Andoroid' without 'Mobile' string is a tablet-like device. - $exceptionAgent = array('Android' => 'Mobile'); + $padAgent = array('iPad','webOS','hp-tablet','PlayBook'); foreach($padAgent as $agent) { if(strpos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE) { - if(!isset($exceptionAgent[$agent])) - { - $UACheck = TRUE; - return TRUE; - } - elseif(strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE) - { - $UACheck = TRUE; - return TRUE; - } + $UACheck = TRUE; + return TRUE; } }