[evolvis-commits] r18323: commit a better fix for #652948 I just engineered to the MW-1.15 branch

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Apr 11 11:16:52 CEST 2012


Author: mirabilos
Date: 2012-04-11 11:16:52 +0200 (Wed, 11 Apr 2012)
New Revision: 18323

Added:
   trunk/mediawiki/debian/patches/khtml_not_ff9.patch
Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/patches/series
Log:
commit a better fix for #652948 I just engineered to the MW-1.15 branch

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:16:51 UTC (rev 18322)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:16:52 UTC (rev 18323)
@@ -1,3 +1,9 @@
+mediawiki (1:1.15.5-6) UNRELEASED; urgency=low
+
+  * debian/patches/khtml_not_ff9.patch: new (Closes: #652948)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 11 Jan 2012 10:03:14 +0100
+
 mediawiki (1:1.15.5-5) unstable; urgency=high
 
   * Security fixes from upstream:

Added: trunk/mediawiki/debian/patches/khtml_not_ff9.patch
===================================================================
--- trunk/mediawiki/debian/patches/khtml_not_ff9.patch	                        (rev 0)
+++ trunk/mediawiki/debian/patches/khtml_not_ff9.patch	2012-04-11 09:16:52 UTC (rev 18323)
@@ -0,0 +1,15 @@
+Fix to not use KHTML quirks for Firef*x 9: Debian #652948
+
+Index: mediawiki-1.15.5/skins/common/wikibits.js
+===================================================================
+--- mediawiki-1.15.5.orig/skins/common/wikibits.js	2012-01-11 09:58:07.000000000 +0100
++++ mediawiki-1.15.5/skins/common/wikibits.js	2012-01-11 09:58:18.000000000 +0100
+@@ -11,7 +11,7 @@
+ 	var webkit_version = parseInt(webkit_match[1]);
+ }
+ var is_khtml = navigator.vendor == 'KDE' ||
+-	( document.childNodes && !document.all && !navigator.taintEnabled );
++	( navigator.product != 'Gecko' && document.childNodes && !document.all && !navigator.taintEnabled );
+ // For accesskeys; note that FF3+ is included here!
+ var is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC );
+ var is_ff2_ = /firefox\/2/.test( clientPC );

Modified: trunk/mediawiki/debian/patches/series
===================================================================
--- trunk/mediawiki/debian/patches/series	2012-04-11 09:16:51 UTC (rev 18322)
+++ trunk/mediawiki/debian/patches/series	2012-04-11 09:16:52 UTC (rev 18323)
@@ -15,3 +15,4 @@
 CVE-2011-1587.patch
 CVE-2011-4360.patch
 CVE-2011-4361.patch
+khtml_not_ff9.patch



More information about the evolvis-commits mailing list