Code cleanup: normalize case of wfMsg() calls, clean up an old str_replace

diff --git a/includes/Article.php b/includes/Article.php
index c318ce1..a99e733 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1982,7 +1982,7 @@ class Article {
 
                $from = str_replace( '_', ' ', $wgRequest->getVal( 'from' ) );
                if( $from != $current->getUserText() ) {
-                       $wgOut->setPageTitle(wfmsg('rollbackfailed'));
+                       $wgOut->setPageTitle( wfMsg('rollbackfailed') );
                        $wgOut->addWikiText( wfMsg( 'alreadyrolled',
                                htmlspecialchars( $this->mTitle->getPrefixedText()),
                                htmlspecialchars( $from ),

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 64a79b5..fbf06ba 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -354,12 +354,12 @@ class EditPage {
                                }
                        }
                        if($addstandardintro) {
-                               $wgOut->addWikiText(wfmsg('newarticletext'));                           
+                               $wgOut->addWikiText( wfMsg( 'newarticletext' ) );                               
                        }
                }
 
                if( $this->mTitle->isTalkPage() ) {
-                       $wgOut->addWikiText(wfmsg('talkpagetext'));
+                       $wgOut->addWikiText( wfMsg( 'talkpagetext' ) );
                }
 
                # Attempt submission here.  This will check for edit conflicts,
@@ -733,12 +733,11 @@ wfdebug("CONFLICT: edittime=".$this->edittime." article timestamp=".$this->mArti
                }
 
                global $wgUseMetadataEdit ;
-               if ( $wgUseMetadataEdit )
-               {
+               if ( $wgUseMetadataEdit ) {
                        $metadata = $this->mMetaData ;
                        $metadata = htmlspecialchars( $wgContLang->recodeForEdit( $metadata ) ) ;
-                       $helppage = Title::newFromText ( wfmsg("metadata_page") ) ;
-                       $top = str_replace ( "$1" , $helppage->getInternalURL() , wfmsg("metadata") ) ;
+                       $helppage = Title::newFromText( wfMsg( "metadata_page" ) ) ;
+                       $top = wfMsg( 'metadata', $helppage->getInternalURL() );
                        $metadata = $top . "<textarea name='metadata' rows='3' cols='{$cols}'{$ew}>{$metadata}</textarea>" ;
                }
                else $metadata = "" ;