Fix jQuery bug filed upstream as http://dev.jquery.com/ticket/5583 . Also fixes bug...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4528013..4cf93e4 100644 (file)
--- 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 e8867a5..d9f6a09 100644 (file)
--- 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 801be99..00602c2 100644 (file)
--- 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;