From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 30 Apr 2007 20:53:31 +0000 (+0000)
Subject: * (bug 7629) Fix $wgBrowserBlackList to avoid false positive on MSIE
X-Git-Tag: 1.31.0-rc.0~53165
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=d7b9b8198737fda24eaa0659fae199d934e0bc83;p=lhc%2Fweb%2Fwiklou.git

* (bug 7629) Fix $wgBrowserBlackList to avoid false positive on MSIE
  when certain plugins are present which alter the user agent
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cae552f0b0..d6c82fdcb7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -369,6 +369,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   - don't emit too many list close tags after an invisible header
   - don't emit too many final list close tags if last header is invisible
   - don't emit TOC when there are no visible headers
+* (bug 7629) Fix $wgBrowserBlackList to avoid false positive on MSIE
+  when certain plugins are present which alter the user agent
 
 
 == Maintenance ==
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 35189151b3..a8733e138f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1962,9 +1962,9 @@ $wgBrowserBlackList = array(
 	 * 
 	 * Reference: http://www.psychedelix.com/agents/index.shtml
 	 */
-	'/^Mozilla\/2\.[^ ]+ .*?\((?!compatible).*; [UIN]/',
-	'/^Mozilla\/3\.[^ ]+ .*?\((?!compatible).*; [UIN]/',
-	'/^Mozilla\/4\.[^ ]+ .*?\((?!compatible).*; [UIN]/',
+	'/^Mozilla\/2\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
+	'/^Mozilla\/3\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
+	'/^Mozilla\/4\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
 	
 	/**
 	 * MSIE on Mac OS 9 is teh sux0r, converts þ to <thorn>, ð to <eth>, Þ to <THORN> and Ð to <ETH>