Merge pull request #1 from PrestaEdit/mobile

[-] FO : show mobile theme if you have click "Broswe the mobile site" on...

classes/Context.php

@@ -110,6 +110,10 @@ class ContextCore
 		{
 			$this->mobile_device = false;
 			if ($this->checkMobileContext())
+			{
+				if(Context::getContext()->cookie->no_mobile == false AND (int)Configuration::get('PS_ALLOW_MOBILE_DEVICE') != 0)
+					$this->mobile_device = true;
+				else
 				{
 					require_once(_PS_TOOL_DIR_.'mobile_Detect/Mobile_Detect.php');
 					$this->mobile_detect = new Mobile_Detect();
@@ -130,6 +134,7 @@ class ContextCore
 					}
 				}
 			}
+		}
 
 		return $this->mobile_device;
 	}