Bug 32673: Keep the username in the input field if not existing

[lhc/web/wiklou.git] / includes / specials / SpecialProtectedtitles.php

diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php
index e347894..982feb6 100644 (file)
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -36,8 +36,6 @@ class SpecialProtectedtitles extends SpecialPage {
        }
 
        function execute( $par ) {
-               global $wgOut, $wgRequest;
-
                $this->setHeaders();
                $this->outputHeader();
 
@@ -46,15 +44,16 @@ class SpecialProtectedtitles extends SpecialPage {
                        Title::purgeExpiredRestrictions();
                }
 
-               $type = $wgRequest->getVal( $this->IdType );
-               $level = $wgRequest->getVal( $this->IdLevel );
-               $sizetype = $wgRequest->getVal( 'sizetype' );
-               $size = $wgRequest->getIntOrNull( 'size' );
-               $NS = $wgRequest->getIntOrNull( 'namespace' );
+               $request = $this->getRequest();
+               $type = $request->getVal( $this->IdType );
+               $level = $request->getVal( $this->IdLevel );
+               $sizetype = $request->getVal( 'sizetype' );
+               $size = $request->getIntOrNull( 'size' );
+               $NS = $request->getIntOrNull( 'namespace' );
 
                $pager = new ProtectedTitlesPager( $this, array(), $type, $level, $NS, $sizetype, $size );
 
-               $wgOut->addHTML( $this->showOptions( $NS, $type, $level ) );
+               $this->getOutput()->addHTML( $this->showOptions( $NS, $type, $level ) );
 
                if ( $pager->getNumRows() ) {
                        $s = $pager->getNavigationBar();
@@ -65,7 +64,7 @@ class SpecialProtectedtitles extends SpecialPage {
                } else {
                        $s = '<p>' . wfMsgHtml( 'protectedtitlesempty' ) . '</p>';
                }
-               $wgOut->addHTML( $s );
+               $this->getOutput()->addHTML( $s );
        }
 
        /**
@@ -74,17 +73,16 @@ class SpecialProtectedtitles extends SpecialPage {
         * @return string
         */
        function formatRow( $row ) {
-               global $wgUser, $wgLang;
-
                wfProfileIn( __METHOD__ );
 
-               static $skin=null;
+               static $infinity = null;
 
-               if( is_null( $skin ) )
-                       $skin = $wgUser->getSkin();
+               if( is_null( $infinity ) ){
+                       $infinity = wfGetDB( DB_SLAVE )->getInfinity();
+               }
 
                $title = Title::makeTitleSafe( $row->pt_namespace, $row->pt_title );
-               $link = $skin->link( $title );
+               $link = Linker::link( $title );
 
                $description_items = array ();
 
@@ -92,19 +90,22 @@ class SpecialProtectedtitles extends SpecialPage {
 
                $description_items[] = $protType;
 
-               $stxt = '';
-
-               if ( $row->pt_expiry != 'infinity' && strlen($row->pt_expiry) ) {
-                       $expiry = $wgLang->formatExpiry( $row->pt_expiry );
-
-                       $expiry_description = wfMsg( 'protect-expiring', $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
-
-                       $description_items[] = $expiry_description;
+               $lang = $this->getLanguage();
+               $expiry = strlen( $row->pt_expiry ) ? $lang->formatExpiry( $row->pt_expiry, TS_MW ) : $infinity;
+               if( $expiry != $infinity ) {
+                       $expiry_description = wfMsg(
+                               'protect-expiring-local',
+                               $lang->timeanddate( $expiry, true ),
+                               $lang->date( $expiry, true ),
+                               $lang->time( $expiry, true )
+                       );
+
+                       $description_items[] = htmlspecialchars($expiry_description);
                }
 
                wfProfileOut( __METHOD__ );
 
-               return '<li>' . wfSpecialList( $link . $stxt, implode( $description_items, ', ' ) ) . "</li>\n";
+               return '<li>' . $lang->specialList( $link, implode( $description_items, ', ' ) ) . "</li>\n";
        }
 
        /**
@@ -116,7 +117,7 @@ class SpecialProtectedtitles extends SpecialPage {
        function showOptions( $namespace, $type='edit', $level ) {
                global $wgScript;
                $action = htmlspecialchars( $wgScript );
-               $title = SpecialPage::getTitleFor( 'Protectedtitles' );
+               $title = $this->getTitle();
                $special = htmlspecialchars( $title->getPrefixedDBkey() );
                return "<form action=\"$action\" method=\"get\">\n" .
                        '<fieldset>' .
@@ -189,7 +190,7 @@ class ProtectedTitlesPager extends AlphabeticPager {
                $this->level = $level;
                $this->namespace = $namespace;
                $this->size = intval($size);
-               parent::__construct();
+               parent::__construct( $form->getContext() );
        }
 
        function getStartBody() {
@@ -207,10 +208,20 @@ class ProtectedTitlesPager extends AlphabeticPager {
                return '';
        }
 
+       /**
+        * @return Title
+        */
+       function getTitle() {
+               return SpecialPage::getTitleFor( 'Protectedtitles' );
+       }
+
        function formatRow( $row ) {
                return $this->mForm->formatRow( $row );
        }
 
+       /**
+        * @return array
+        */
        function getQueryInfo() {
                $conds = $this->mConds;
                $conds[] = 'pt_expiry>' . $this->mDb->addQuotes( $this->mDb->timestamp() );