* Changed signature-ip to signature-anon

* Removed the hardcoding of the link parameter ($1), let the message control the destination.
* Removed the hardcoded talk page links. They can be easily re-added if desired, though, and added per-wiki.
* Removed the $3 and $4 parameters
* Fixed wfEscapeWikiText() to do "]" as well as "[", so sigs with "]" won't break links
* Updated a parser test case for the escaping change

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ad2cf08..00fec8d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -60,7 +60,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add ot=raw to Special:Allmessages
 * Support for Hebrew calendar
 * Support for Hebrew numerals in dates and times
-* (bug 11315) Signatures can be configured in [[MediaWiki:Signature]] and [[MediaWiki:Signature-ip]]
+* (bug 11315) Signatures can be configured in [[MediaWiki:Signature]] and
+  [[MediaWiki:Signature-anon]]
 * Signatures for anonymous users link to Special:Contributions page rather than user page
 * Added --override switch for disabled pages in updateSpecialPages.php
 

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a8fbb39..008a6d2 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -889,8 +889,8 @@ function wfCheckLimits( $deflimit = 50, $optionname = 'rclimit' ) {
  */
 function wfEscapeWikiText( $text ) {
        $text = str_replace(
-               array( '[',     '|',      '\'',    'ISBN ',     'RFC ',     '://',     "\n=",     '{{' ),
-               array( '[', '|', ''', 'ISBN ', 'RFC ', '://', "\n=", '{{' ),
+               array( '[',     '|',      ']',     '\'',    'ISBN ',     'RFC ',     '://',     "\n=",     '{{' ),
+               array( '[', '|', ']', ''', 'ISBN ', 'RFC ', '://', "\n=", '{{' ),
                htmlspecialchars($text) );
        return $text;
 }

diff --git a/includes/Parser.php b/includes/Parser.php
index 0ad8b82..46687e6 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -3878,17 +3878,12 @@ class Parser
                $nickname = $this->cleanSigInSig( $nickname );
 
                # If we're still here, make it a link to the user page
-               $userpage = $user->getUserPage();
+               $userText = wfEscapeWikiText( $username );
+               $nickText = wfEscapeWikiText( $nickname );
                if ( $user->isAnon() )  {
-                       $title = SpecialPage::getTitleFor('Contributions' );
-                       return ( wfMsgForContent( 'signature-ip', 
-                                                       $title->getPrefixedText() . '/' . wfEscapeWikiText( $username ), 
-                                                       wfEscapeWikiText( $nickname ), 
-                                                       $userpage->getTalkPage(), wfMsgForContent('talkpagelinktext') ) );
+                       return wfMsgForContent( 'signature-anon', $userText, $nickText );
                } else {
-                       return ( wfMsgForContent( 'signature', $userpage->getPrefixedText(), 
-                                                       wfEscapeWikiText( $nickname ), 
-                                                       $userpage->getTalkPage(), wfMsgForContent('talkpagelinktext') ) );
+                       return wfMsgForContent( 'signature', $userText, $nickText );
                }
        }
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 735a5ff..c40117d 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3045,7 +3045,7 @@ $1',
 'hebrew-calendar-m12-gen' => 'Elul', # only translate this message to other languages if you have to change it
 
 # Default signatures for all languages. Do not duplicate to other languages
-'signature' => '[[$1|$2]] ([[$3|$4]])', # default signature for registered users
-'signature-ip' => '[[$1|$2]] ([[$3|$4]])', # default signature for anonymous users
+'signature' => '[[User:$1|$2]]', # default signature for registered users
+'signature-anon' => '[[Special:Contributions/$1|$2]]', # default signature for anonymous users
 
 );

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 5bb967d..6baf302 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -255,7 +255,7 @@ $wgOptionalMessages = array(
        'hebrew-calendar-m11-gen',
        'hebrew-calendar-m12-gen',
        'signature',
-       'signature-ip',
+       'signature-anon',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index c01f4e3..3343ed5 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2272,7 +2272,7 @@ $wgMessageStructure = array(
        ),
        'signatures' => array(
                'signature',
-               'signature-ip',
+               'signature-anon',
        ),
 );
 /** Comments for each block */

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 9b5d973..8e84e96 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -6251,7 +6251,7 @@ MSGNW magic word
 !! input
 {{MSGNW:msg}}
 !! result
-<p>&#91;&#91;:Template:Msg]]
+<p>&#91;&#91;:Template:Msg&#93;&#93;
 </p>
 !! end