Index: branches/camp/camp-2_5-E/data/class/SC_Display.php
===================================================================
--- branches/camp/camp-2_5-E/data/class/SC_Display.php	(revision 19020)
+++ branches/camp/camp-2_5-E/data/class/SC_Display.php	(revision 19021)
@@ -53,5 +53,6 @@
         if($nu->isMobile()){
             $retDevice = 1;
-        }elseif ()
+        }elseif ($this->isSmartphone()){
+        }else{
         if($this->autoSet){
             $this->setDevice($nu);
@@ -78,8 +79,6 @@
 
         $pattern = implode("|", $useragents);
-        
-        if(preg_match('/['.$pattern.']/', $_SERVER['HTTP_USER_AGENT']))
-        var pattern = new RegExp(useragents.join('|'), 'i');
-        return pattern.test(navigator.userAgent);
+        return preg_match('/['.$pattern.']/', $_SERVER['HTTP_USER_AGENT']);
+
     }