revert r106095, fix apparently not this simple

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

diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index e664c20..eec974f 100644 (file)
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -36,8 +36,6 @@ class SpecialProtectedpages extends SpecialPage {
        }
 
        public function execute( $par ) {
-               global $wgOut, $wgRequest;
-
                $this->setHeaders();
                $this->outputHeader();
 
@@ -46,17 +44,18 @@ class SpecialProtectedpages 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' );
-               $indefOnly = $wgRequest->getBool( 'indefonly' ) ? 1 : 0;
-               $cascadeOnly = $wgRequest->getBool('cascadeonly') ? 1 : 0;
+               $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' );
+               $indefOnly = $request->getBool( 'indefonly' ) ? 1 : 0;
+               $cascadeOnly = $request->getBool('cascadeonly') ? 1 : 0;
 
                $pager = new ProtectedPagesPager( $this, array(), $type, $level, $NS, $sizetype, $size, $indefOnly, $cascadeOnly );
 
-               $wgOut->addHTML( $this->showOptions( $NS, $type, $level, $sizetype, $size, $indefOnly, $cascadeOnly ) );
+               $this->getOutput()->addHTML( $this->showOptions( $NS, $type, $level, $sizetype, $size, $indefOnly, $cascadeOnly ) );
 
                if( $pager->getNumRows() ) {
                        $s = $pager->getNavigationBar();
@@ -67,7 +66,7 @@ class SpecialProtectedpages extends SpecialPage {
                } else {
                        $s = '<p>' . wfMsgHtml( 'protectedpagesempty' ) . '</p>';
                }
-               $wgOut->addHTML( $s );
+               $this->getOutput()->addHTML( $s );
        }
 
        /**
@@ -76,17 +75,16 @@ class SpecialProtectedpages extends SpecialPage {
         * @return string Formatted <li> element
         */
        public function formatRow( $row ) {
-               global $wgUser, $wgLang, $wgContLang;
-
                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->page_namespace, $row->page_title );
-               $link = $skin->link( $title );
+               $link = Linker::link( $title );
 
                $description_items = array ();
 
@@ -99,23 +97,28 @@ class SpecialProtectedpages extends SpecialPage {
                }
 
                $stxt = '';
+               $lang = $this->getLanguage();
 
-               if( $row->pr_expiry != 'infinity' && strlen($row->pr_expiry) ) {
-                       $expiry = Block::decodeExpiry( $row->pr_expiry );
+               $expiry = $lang->formatExpiry( $row->pr_expiry, TS_MW );
+               if( $expiry != $infinity ) {
 
-                       $expiry_description = wfMsg( 'protect-expiring' , $wgLang->timeanddate( $expiry ) , 
-                               $wgLang->date( $expiry ) , $wgLang->time( $expiry ) );
+                       $expiry_description = wfMsg(
+                               'protect-expiring-local',
+                               $lang->timeanddate( $expiry, true ),
+                               $lang->date( $expiry, true ),
+                               $lang->time( $expiry, true )
+                       );
 
                        $description_items[] = htmlspecialchars($expiry_description);
                }
 
                if(!is_null($size = $row->page_len)) {
-                       $stxt = $wgContLang->getDirMark() . ' ' . $skin->formatRevisionSize( $size );
+                       $stxt = $lang->getDirMark() . ' ' . Linker::formatRevisionSize( $size );
                }
 
                # Show a link to the change protection form for allowed users otherwise a link to the protection log
-               if( $wgUser->isAllowed( 'protect' ) ) {
-                       $changeProtection = ' (' . $skin->linkKnown(
+               if( $this->getUser()->isAllowed( 'protect' ) ) {
+                       $changeProtection = ' (' . Linker::linkKnown(
                                $title,
                                wfMsgHtml( 'protect_change' ),
                                array(),
@@ -123,7 +126,7 @@ class SpecialProtectedpages extends SpecialPage {
                        ) . ')';
                } else {
                        $ltitle = SpecialPage::getTitleFor( 'Log' );
-                       $changeProtection = ' (' . $skin->linkKnown(
+                       $changeProtection = ' (' . Linker::linkKnown(
                                $ltitle,
                                wfMsgHtml( 'protectlogpage' ),
                                array(),
@@ -139,7 +142,7 @@ class SpecialProtectedpages extends SpecialPage {
                return Html::rawElement(
                        'li',
                        array(),
-                       wfSpecialList( $link . $stxt, $wgLang->commaList( $description_items ) ) . $changeProtection ) . "\n";
+                       $lang->specialList( $link . $stxt, $lang->commaList( $description_items ), false ) . $changeProtection ) . "\n";
        }
 
        /**
@@ -154,7 +157,7 @@ class SpecialProtectedpages extends SpecialPage {
         */
        protected function showOptions( $namespace, $type='edit', $level, $sizetype, $size, $indefOnly, $cascadeOnly ) {
                global $wgScript;
-               $title = SpecialPage::getTitleFor( 'Protectedpages' );
+               $title = $this->getTitle();
                return Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', array(), wfMsg( 'protectedpages' ) ) .
@@ -193,7 +196,7 @@ class SpecialProtectedpages extends SpecialPage {
                return
                        Xml::checkLabel( wfMsg('protectedpages-indef'), 'indefonly', 'indefonly', $indefOnly ) . "\n";
        }
-       
+
        /**
         * @return string Formatted HTML
         */
@@ -224,13 +227,11 @@ class SpecialProtectedpages extends SpecialPage {
         * @return string Formatted HTML
         */
        protected function getTypeMenu( $pr_type ) {
-               global $wgRestrictionTypes;
-
                $m = array(); // Temporary array
                $options = array();
 
                // First pass to load the log names
-               foreach( $wgRestrictionTypes as $type ) {
+               foreach( Title::getFilteredRestrictionTypes( true ) as $type ) {
                        $text = wfMsg("restriction-$type");
                        $m[$text] = $type;
                }
@@ -290,7 +291,7 @@ class ProtectedPagesPager extends AlphabeticPager {
        public $mForm, $mConds;
        private $type, $level, $namespace, $sizetype, $size, $indefonly;
 
-       function __construct( $form, $conds = array(), $type, $level, $namespace, $sizetype='', $size=0, 
+       function __construct( $form, $conds = array(), $type, $level, $namespace, $sizetype='', $size=0,
                $indefonly = false, $cascadeonly = false )
        {
                $this->mForm = $form;
@@ -302,7 +303,7 @@ class ProtectedPagesPager extends AlphabeticPager {
                $this->size = intval($size);
                $this->indefonly = (bool)$indefonly;
                $this->cascadeonly = (bool)$cascadeonly;
-               parent::__construct();
+               parent::__construct( $form->getContext() );
        }
 
        function getStartBody() {
@@ -325,15 +326,16 @@ class ProtectedPagesPager extends AlphabeticPager {
                                'OR pr_expiry IS NULL)';
                $conds[] = 'page_id=pr_page';
                $conds[] = 'pr_type=' . $this->mDb->addQuotes( $this->type );
-               
+
                if( $this->sizetype=='min' ) {
                        $conds[] = 'page_len>=' . $this->size;
-               } else if( $this->sizetype=='max' ) {
+               } elseif( $this->sizetype=='max' ) {
                        $conds[] = 'page_len<=' . $this->size;
                }
 
                if( $this->indefonly ) {
-                       $conds[] = "pr_expiry = 'infinity' OR pr_expiry IS NULL";
+                       $db = wfGetDB( DB_SLAVE );
+                       $conds[] = "pr_expiry = {$db->addQuotes( $db->getInfinity() )} OR pr_expiry IS NULL";
                }
                if( $this->cascadeonly ) {
                        $conds[] = "pr_cascade = '1'";