From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 2 Dec 2009 16:28:29 +0000 (+0000)
Subject: Fix jQuery bug filed upstream as http://dev.jquery.com/ticket/5583 . Also fixes bug... 
X-Git-Tag: 1.31.0-rc.0~38656
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=e6e58fe450fea8bcb116e5aa5d701eab32261ef7;p=lhc%2Fweb%2Fwiklou.git

Fix jQuery bug filed upstream as dev.jquery.com/ticket/5583 . Also fixes bug 21709 (dialogs freeze in raw/combined mode but not in minified mode). The fact that this worked in minified mode is due to a bug in JSmin, contacted the author about that.
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 45280132c4..4cf93e4893 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1618,7 +1618,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches do not keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '254';
+$wgStyleVersion = '255';
 
 
 # Server-side caching:
diff --git a/includes/EditPage.php b/includes/EditPage.php
index e8867a5452..d9f6a09c02 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1541,7 +1541,7 @@ END
 		if ( $userInputAttrs )
 			$inputAttrs += $userInputAttrs;
 		$spanLabelAttrs = array(
-			'class' => $summaryClass,
+			'class' => @$summaryClass,
 			'id' => "wpSummaryLabel"
 		);
 		if ( is_array($userSpanLabelAttrs) )
diff --git a/js2/js2stopgap.js b/js2/js2stopgap.js
index 801be99224..00602c2e01 100644
--- a/js2/js2stopgap.js
+++ b/js2/js2stopgap.js
@@ -610,7 +610,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 };
 
 // exclude the following css properties to add px
-var exclude = / z - ? index | font - ? weight | opacity | zoom | line - ? height /i,
+var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
 	// cache defaultView
 	defaultView = document.defaultView || { },
 	toString = Object.prototype.toString;