| Index: trunk/phase3/maintenance/parserTests.txt |
| — | — | @@ -6251,7 +6251,7 @@ |
| 6252 | 6252 | !! input |
| 6253 | 6253 | {{MSGNW:msg}} |
| 6254 | 6254 | !! result |
| 6255 | | -<p>[[:Template:Msg]] |
| | 6255 | +<p>[[:Template:Msg]] |
| 6256 | 6256 | </p> |
| 6257 | 6257 | !! end |
| 6258 | 6258 | |
| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -2272,7 +2272,7 @@ |
| 2273 | 2273 | ), |
| 2274 | 2274 | 'signatures' => array( |
| 2275 | 2275 | 'signature', |
| 2276 | | - 'signature-ip', |
| | 2276 | + 'signature-anon', |
| 2277 | 2277 | ), |
| 2278 | 2278 | ); |
| 2279 | 2279 | /** Comments for each block */ |
| Index: trunk/phase3/maintenance/language/messageTypes.inc |
| — | — | @@ -255,7 +255,7 @@ |
| 256 | 256 | 'hebrew-calendar-m11-gen', |
| 257 | 257 | 'hebrew-calendar-m12-gen', |
| 258 | 258 | 'signature', |
| 259 | | - 'signature-ip', |
| | 259 | + 'signature-anon', |
| 260 | 260 | ); |
| 261 | 261 | |
| 262 | 262 | /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ |
| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -889,8 +889,8 @@ |
| 890 | 890 | */ |
| 891 | 891 | function wfEscapeWikiText( $text ) { |
| 892 | 892 | $text = str_replace( |
| 893 | | - array( '[', '|', '\'', 'ISBN ', 'RFC ', '://', "\n=", '{{' ), |
| 894 | | - array( '[', '|', ''', 'ISBN ', 'RFC ', '://', "\n=", '{{' ), |
| | 893 | + array( '[', '|', ']', '\'', 'ISBN ', 'RFC ', '://', "\n=", '{{' ), |
| | 894 | + array( '[', '|', ']', ''', 'ISBN ', 'RFC ', '://', "\n=", '{{' ), |
| 895 | 895 | htmlspecialchars($text) ); |
| 896 | 896 | return $text; |
| 897 | 897 | } |
| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -3878,17 +3878,12 @@ |
| 3879 | 3879 | $nickname = $this->cleanSigInSig( $nickname ); |
| 3880 | 3880 | |
| 3881 | 3881 | # If we're still here, make it a link to the user page |
| 3882 | | - $userpage = $user->getUserPage(); |
| | 3882 | + $userText = wfEscapeWikiText( $username ); |
| | 3883 | + $nickText = wfEscapeWikiText( $nickname ); |
| 3883 | 3884 | if ( $user->isAnon() ) { |
| 3884 | | - $title = SpecialPage::getTitleFor('Contributions' ); |
| 3885 | | - return ( wfMsgForContent( 'signature-ip', |
| 3886 | | - $title->getPrefixedText() . '/' . wfEscapeWikiText( $username ), |
| 3887 | | - wfEscapeWikiText( $nickname ), |
| 3888 | | - $userpage->getTalkPage(), wfMsgForContent('talkpagelinktext') ) ); |
| | 3885 | + return wfMsgForContent( 'signature-anon', $userText, $nickText ); |
| 3889 | 3886 | } else { |
| 3890 | | - return ( wfMsgForContent( 'signature', $userpage->getPrefixedText(), |
| 3891 | | - wfEscapeWikiText( $nickname ), |
| 3892 | | - $userpage->getTalkPage(), wfMsgForContent('talkpagelinktext') ) ); |
| | 3887 | + return wfMsgForContent( 'signature', $userText, $nickText ); |
| 3893 | 3888 | } |
| 3894 | 3889 | } |
| 3895 | 3890 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -3045,7 +3045,7 @@ |
| 3046 | 3046 | 'hebrew-calendar-m12-gen' => 'Elul', # only translate this message to other languages if you have to change it |
| 3047 | 3047 | |
| 3048 | 3048 | # Default signatures for all languages. Do not duplicate to other languages |
| 3049 | | -'signature' => '[[$1|$2]] ([[$3|$4]])', # default signature for registered users |
| 3050 | | -'signature-ip' => '[[$1|$2]] ([[$3|$4]])', # default signature for anonymous users |
| | 3049 | +'signature' => '[[User:$1|$2]]', # default signature for registered users |
| | 3050 | +'signature-anon' => '[[Special:Contributions/$1|$2]]', # default signature for anonymous users |
| 3051 | 3051 | |
| 3052 | 3052 | ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -60,7 +60,8 @@ |
| 61 | 61 | * Add ot=raw to Special:Allmessages |
| 62 | 62 | * Support for Hebrew calendar |
| 63 | 63 | * Support for Hebrew numerals in dates and times |
| 64 | | -* (bug 11315) Signatures can be configured in [[MediaWiki:Signature]] and [[MediaWiki:Signature-ip]] |
| | 64 | +* (bug 11315) Signatures can be configured in [[MediaWiki:Signature]] and |
| | 65 | + [[MediaWiki:Signature-anon]] |
| 65 | 66 | * Signatures for anonymous users link to Special:Contributions page rather than user page |
| 66 | 67 | * Added --override switch for disabled pages in updateSpecialPages.php |
| 67 | 68 | |