* Use user's language for 'protect-expiring' message in Special:Protectedpages and...

* removed $wgOut->setPagetitle( ... ), already done in SpecialPage::execute()

diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index 73ce43f..4e56ca4 100644 (file)
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -16,7 +16,6 @@ class ProtectedPagesForm {
        public function showList( $msg = '' ) {
                global $wgOut, $wgRequest;
 
-               $wgOut->setPagetitle( wfMsg( "protectedpages" ) );
                if ( "" != $msg ) {
                        $wgOut->setSubtitle( $msg );
                }
@@ -84,7 +83,7 @@ class ProtectedPagesForm {
                if ( $row->pr_expiry != 'infinity' && strlen($row->pr_expiry) ) {
                        $expiry = Block::decodeExpiry( $row->pr_expiry );
 
-                       $expiry_description = wfMsgForContent( 'protect-expiring' , $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
+                       $expiry_description = wfMsg( 'protect-expiring' , $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
 
                        $description_items[] = $expiry_description;
                }

diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php
index 7a39463..7e8126d 100644 (file)
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -16,7 +16,6 @@ class ProtectedTitlesForm {
        function showList( $msg = '' ) {
                global $wgOut, $wgRequest;
 
-               $wgOut->setPagetitle( wfMsg( "protectedtitles" ) );
                if ( "" != $msg ) {
                        $wgOut->setSubtitle( $msg );
                }
@@ -75,7 +74,7 @@ class ProtectedTitlesForm {
                if ( $row->pt_expiry != 'infinity' && strlen($row->pt_expiry) ) {
                        $expiry = Block::decodeExpiry( $row->pt_expiry );
 
-                       $expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
+                       $expiry_description = wfMsg( 'protect-expiring', $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
 
                        $description_items[] = $expiry_description;
                }