Further fix: restore order of parameters on addButton() to most backwards- and forwar...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1f63f6c..8038676 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1117,7 +1117,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '57';
+$wgStyleVersion = '58';
 
 
 # Server-side caching:

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7567c30..505e800 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1690,7 +1690,7 @@ END
 
                        #$key = $tool["key"];
 
-                       $toolbar.="addButton('$cssId','$image','$tip','$open','$close','$sample');\n";
+                       $toolbar.="addButton('$image','$tip','$open','$close','$sample','$cssId');\n";
                }
 
                $toolbar.="/*]]>*/\n</script>";

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 7889c39..bb2280b 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -330,7 +330,7 @@ var mwCustomEditButtons = []; // eg to add in MediaWiki:Common.js
 
 // this function generates the actual toolbar buttons with localized text
 // we use it to avoid creating the toolbar where javascript is not enabled
-function addButton(imageId, imageFile, speedTip, tagOpen, tagClose, sampleText) {
+function addButton(imageFile, speedTip, tagOpen, tagClose, sampleText, imageId) {
        // Don't generate buttons for browsers which don't fully
        // support it.
        mwEditButtons[mwEditButtons.length] =