From: Max Semenik <maxsem.wiki@gmail.com>
Date: Sat, 2 Jun 2012 14:36:44 +0000 (+0200)
Subject: Sync DeviceDetection with MF
X-Git-Tag: 1.31.0-rc.0~23136^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=12e7e2dbd0a369b5cc87113d9753f597c8d319c1;p=lhc%2Fweb%2Fwiklou.git

Sync DeviceDetection with MF

Change-Id: I7f15c44f31dacdf208ca159a7b5756884245a494
---

diff --git a/includes/mobile/DeviceDetection.php b/includes/mobile/DeviceDetection.php
index bca69851fb..262665be1a 100644
--- a/includes/mobile/DeviceDetection.php
+++ b/includes/mobile/DeviceDetection.php
@@ -363,13 +363,15 @@ class DeviceDetection implements IDeviceDetector {
 			$deviceName = 'android';
 			if ( strpos( $userAgent, 'Opera Mini' ) !== false ) {
 				$deviceName = 'operamini';
+			} elseif ( strpos( $userAgent, 'Opera Mobi' ) !== false ) {
+				$deviceName = 'operamobile';
 			}
-		} else if ( preg_match( '/MSIE 9.0/', $userAgent ) ||
+		} elseif ( preg_match( '/MSIE 9.0/', $userAgent ) ||
 				preg_match( '/MSIE 8.0/', $userAgent ) ) {
 			$deviceName = 'ie';
-		} else if( preg_match( '/MSIE/', $userAgent ) ) {
+		} elseif( preg_match( '/MSIE/', $userAgent ) ) {
 			$deviceName = 'html';
-		} else if ( strpos( $userAgent, 'Opera Mobi' ) !== false ) {
+		} elseif ( strpos( $userAgent, 'Opera Mobi' ) !== false ) {
 			$deviceName = 'operamobile';
 		} elseif ( preg_match( '/iPad.* Safari/', $userAgent ) ) {
 			$deviceName = 'iphone';
@@ -398,10 +400,8 @@ class DeviceDetection implements IDeviceDetector {
 				$deviceName = 'wii';
 			} elseif ( strpos( $userAgent, 'Opera Mini' ) !== false ) {
 				$deviceName = 'operamini';
-			} elseif ( strpos( $userAgent, 'Opera Mobi' ) !== false ) {
-				$deviceName = 'iphone';
 			} else {
-				$deviceName = 'webkit';
+				$deviceName = 'operamobile';
 			}
 		} elseif ( preg_match( '/Kindle\/1.0/', $userAgent ) ) {
 			$deviceName = 'kindle';