* (bug 2683) Really fix apostrophe escaping for toolbox tips

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 70b4da3..427ca70 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -458,6 +458,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2648) Rename namespaces in Afrikaanse
 * Special:Booksources checks if custom list page exists before using it
 * (bug 1170) Fixed linktrail for da: and ru:
+* (bug 2683) Really fix apostrophe escaping for toolbox tips
+
 
 === Caveats ===
 

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 1af8091..bc5e2a9 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -643,7 +643,7 @@ function wfEscapeJsString( $string ) {
        $pairs = array(
                "\\" => "\\\\",
                "\"" => "\\\"",
-               "\'" => "\\\'",
+               '\'' => '\\\'',
                "\n" => "\\n",
                "\r" => "\\r",
                

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 74483e4..8726e64 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -306,7 +306,7 @@ function addInfobox(infoText,text_alert) {
 
 function escapeQuotes(text) {
        var re=new RegExp("'","g");
-       text=text.replace(re,"\\'");
+       text=text.replace(re,"'");
        re=new RegExp('"',"g");
        text=text.replace(re,'"');
        re=new RegExp("\\n","g");