From: Max Semenik <maxsem.wiki@gmail.com>
Date: Wed, 1 May 2013 21:19:31 +0000 (+0400)
Subject: Completely blacklist Opera Mobile from RL
X-Git-Tag: 1.31.0-rc.0~19796
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=f9be946857a087d0215d11ff5062e7737e810c5a;p=lhc%2Fweb%2Fwiklou.git

Completely blacklist Opera Mobile from RL

While initially it was believed that allowing it in does no harm,
practice proves otherwise, see the dependencies of bug 47572.

Bug: 47572
Bug: 47570
Bug: 47567
Bug: 47568
Bug: 47569
Change-Id: I32c082d3cca1af4ce97da08f28beb4926ae97ac3
---

diff --git a/resources/startup.js b/resources/startup.js
index e4a16d80e9..6fa8b3c89a 100644
--- a/resources/startup.js
+++ b/resources/startup.js
@@ -38,8 +38,8 @@ function isCompatible( ua ) {
 		ua.match( /SymbianOS|Series60/ ) ||
 		// Any NetFront based browser
 		ua.match( /NetFront/ ) ||
-		// Opera Mini < 7
-		ua.match( /Opera Mini\/[0-6]\./ )
+		// Opera Mini, all versions
+		ua.match( /Opera Mini/ )
 	);
 }
 
diff --git a/tests/qunit/suites/resources/startup.test.js b/tests/qunit/suites/resources/startup.test.js
index cc8e640d8e..57825c5071 100644
--- a/tests/qunit/suites/resources/startup.test.js
+++ b/tests/qunit/suites/resources/startup.test.js
@@ -37,9 +37,7 @@
 			'Mozilla/5.0 (ipod: U;CPU iPhone OS 2_2 like Mac OS X: es_es) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.0 Mobile/3B48b Safari/419.3',
 			'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3B48b Safari/419.3',
 			// Android
-			'Mozilla/5.0 (Linux; U; Android 2.1; en-us; Nexus One Build/ERD62) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17',
-			// Recent Opera Mini - JS mostly doesn't work, but serving jQuery doesn't hurt users
-			'Opera/9.80 (Android; Opera Mini/7.29530/27.1407; U; en) Presto/2.8.119 Version/11.10'
+			'Mozilla/5.0 (Linux; U; Android 2.1; en-us; Nexus One Build/ERD62) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17'
 		],
 		// Supported: Uncompatible, serve basic content
 		gradeB: [
@@ -66,10 +64,11 @@
 			'Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.3 Kindle/1.0 (screen 600x800)',
 			'Mozilla/4.0 (compatible; Linux 2.6.22) NetFront/3.4 Kindle/2.0 (screen 824x1200; rotate)',
 			'Mozilla/4.08 (Windows; Mobile Content Viewer/1.0) NetFront/3.2',
-			// Opera Mini < 7
+			// Opera Mini
 			'Opera/9.80 (J2ME/MIDP; Opera Mini/3.1.10423/22.387; U; en) Presto/2.5.25 Version/10.54',
 			'Opera/9.50 (J2ME/MIDP; Opera Mini/4.0.10031/298; U; en)',
-			'Opera/9.80 (J2ME/MIDP; Opera Mini/6.24093/26.1305; U; en) Presto/2.8.119 Version/10.54'
+			'Opera/9.80 (J2ME/MIDP; Opera Mini/6.24093/26.1305; U; en) Presto/2.8.119 Version/10.54',
+			'Opera/9.80 (Android; Opera Mini/7.29530/27.1407; U; en) Presto/2.8.119 Version/11.10'
 		],
 		// No explicit support for or against these browsers, they're
 		// given a shot at Grade A at their own risk.