* (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 cae552f..d6c82fd 100644 (file)
--- 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 3518915..a8733e1 100644 (file)
--- 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>