https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113727

Revision: 113727
Author:   ialex
Date:     2012-03-13 15:54:20 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
* (bug 34887) Fix for r100138: make $3 and $4 parameters being substituted 
correctly in message "movepage-moved"

Modified Paths:
--------------
    branches/REL1_19/phase3/RELEASE-NOTES-1.19
    branches/REL1_19/phase3/includes/specials/SpecialMovepage.php
    trunk/phase3/RELEASE-NOTES-1.19
    trunk/phase3/includes/specials/SpecialMovepage.php

Modified: branches/REL1_19/phase3/RELEASE-NOTES-1.19
===================================================================
--- branches/REL1_19/phase3/RELEASE-NOTES-1.19  2012-03-13 15:39:33 UTC (rev 
113726)
+++ branches/REL1_19/phase3/RELEASE-NOTES-1.19  2012-03-13 15:54:20 UTC (rev 
113727)
@@ -16,6 +16,8 @@
   included page
 * (bug 35019) Edit summaries are no longer transformed in notification e-mails
 * (bug 35152) Help message for e-mail is shown again in user preferences
+* (bug 34887) $3 and $4 parameters are now substituted correctly in message
+  "movepage-moved"
 
 === Configuration changes in 1.19 ===
 * Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.

Modified: branches/REL1_19/phase3/includes/specials/SpecialMovepage.php
===================================================================
--- branches/REL1_19/phase3/includes/specials/SpecialMovepage.php       
2012-03-13 15:39:33 UTC (rev 113726)
+++ branches/REL1_19/phase3/includes/specials/SpecialMovepage.php       
2012-03-13 15:54:20 UTC (rev 113727)
@@ -471,7 +471,8 @@
                $newText = $nt->getPrefixedText();
 
                $msgName = $createRedirect ? 'movepage-moved-redirect' : 
'movepage-moved-noredirect';
-               $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( 
$oldLink, $newLink, $oldText, $newText )->parseAsBlock() );
+               $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( 
$oldLink,
+                       $newLink )->params( $oldText, $newText 
)->parseAsBlock() );
                $out->addWikiMsg( $msgName );
 
                # Now we move extra pages we've been asked to move: subpages 
and talk

Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19     2012-03-13 15:39:33 UTC (rev 113726)
+++ trunk/phase3/RELEASE-NOTES-1.19     2012-03-13 15:54:20 UTC (rev 113727)
@@ -16,6 +16,8 @@
   included page
 * (bug 35019) Edit summaries are no longer transformed in notification e-mails
 * (bug 35152) Help message for e-mail is shown again in user preferences
+* (bug 34887) $3 and $4 parameters are now substituted correctly in message
+  "movepage-moved"
 
 === Configuration changes in 1.19 ===
 * Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.

Modified: trunk/phase3/includes/specials/SpecialMovepage.php
===================================================================
--- trunk/phase3/includes/specials/SpecialMovepage.php  2012-03-13 15:39:33 UTC 
(rev 113726)
+++ trunk/phase3/includes/specials/SpecialMovepage.php  2012-03-13 15:54:20 UTC 
(rev 113727)
@@ -472,7 +472,8 @@
                $newText = $nt->getPrefixedText();
 
                $msgName = $createRedirect ? 'movepage-moved-redirect' : 
'movepage-moved-noredirect';
-               $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( 
$oldLink, $newLink, $oldText, $newText )->parseAsBlock() );
+               $out->addHTML( wfMessage( 'movepage-moved' )->rawParams( 
$oldLink,
+                       $newLink )->params( $oldText, $newText 
)->parseAsBlock() );
                $out->addWikiMsg( $msgName );
 
                # Now we move extra pages we've been asked to move: subpages 
and talk


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to