From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 22 Jun 2011 11:28:20 +0200 Subject: update to MediaWiki 1.17.0 --- includes/specials/SpecialProtectedtitles.php | 71 ++++++++++++++++------------ 1 file changed, 41 insertions(+), 30 deletions(-) (limited to 'includes/specials/SpecialProtectedtitles.php') diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php index d65b3f79..5b18d87f 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -1,24 +1,45 @@ setSubtitle( $msg ); - } + $this->setHeaders(); + $this->outputHeader(); // Purge expired entries on one in every 10 queries if ( !mt_rand( 0, 10 ) ) { @@ -33,7 +54,7 @@ class ProtectedTitlesForm { $pager = new ProtectedTitlesPager( $this, array(), $type, $level, $NS, $sizetype, $size ); - $wgOut->addHTML( $this->showOptions( $NS, $type, $level, $sizetype, $size ) ); + $wgOut->addHTML( $this->showOptions( $NS, $type, $level ) ); if ( $pager->getNumRows() ) { $s = $pager->getNavigationBar(); @@ -51,7 +72,7 @@ class ProtectedTitlesForm { * Callback function to output a restriction */ function formatRow( $row ) { - global $wgUser, $wgLang, $wgContLang; + global $wgUser, $wgLang; wfProfileIn( __METHOD__ ); @@ -69,7 +90,7 @@ class ProtectedTitlesForm { $description_items[] = $protType; - $expiry_description = ''; $stxt = ''; + $stxt = ''; if ( $row->pt_expiry != 'infinity' && strlen($row->pt_expiry) ) { $expiry = Block::decodeExpiry( $row->pt_expiry ); @@ -85,13 +106,12 @@ class ProtectedTitlesForm { } /** - * @param $namespace int + * @param $namespace Integer: * @param $type string * @param $level string - * @param $minsize int * @private */ - function showOptions( $namespace, $type='edit', $level, $sizetype, $size ) { + function showOptions( $namespace, $type='edit', $level ) { global $wgScript; $action = htmlspecialchars( $wgScript ); $title = SpecialPage::getTitleFor( 'Protectedtitles' ); @@ -99,10 +119,10 @@ class ProtectedTitlesForm { return "
\n" . '
' . Xml::element( 'legend', array(), wfMsg( 'protectedtitles' ) ) . - Xml::hidden( 'title', $special ) . " \n" . - $this->getNamespaceMenu( $namespace ) . " \n" . - $this->getLevelMenu( $level ) . " \n" . - " " . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . + Html::hidden( 'title', $special ) . " \n" . + $this->getNamespaceMenu( $namespace ) . " \n" . + $this->getLevelMenu( $level ) . " \n" . + " " . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . "
"; } @@ -110,12 +130,12 @@ class ProtectedTitlesForm { * Prepare the namespace filter drop-down; standard namespace * selector, sans the MediaWiki namespace * - * @param mixed $namespace Pre-select namespace + * @param $namespace Mixed: pre-select namespace * @return string */ function getNamespaceMenu( $namespace = null ) { return Xml::label( wfMsg( 'namespace' ), 'namespace' ) - . ' ' + . ' ' . Xml::namespaceSelector( $namespace, '' ); } @@ -147,7 +167,7 @@ class ProtectedTitlesForm { } return - Xml::label( wfMsg('restriction-level') , $this->IdLevel ) . ' ' . + Xml::label( wfMsg('restriction-level') , $this->IdLevel ) . ' ' . Xml::tags( 'select', array( 'id' => $this->IdLevel, 'name' => $this->IdLevel ), implode( "\n", $options ) ); @@ -158,7 +178,7 @@ class ProtectedTitlesForm { * @todo document * @ingroup Pager */ -class ProtectedtitlesPager extends AlphabeticPager { +class ProtectedTitlesPager extends AlphabeticPager { public $mForm, $mConds; function __construct( $form, $conds = array(), $type, $level, $namespace, $sizetype='', $size=0 ) { @@ -176,7 +196,7 @@ class ProtectedtitlesPager extends AlphabeticPager { $this->mResult->seek( 0 ); $lb = new LinkBatch; - while ( $row = $this->mResult->fetchObject() ) { + foreach ( $this->mResult as $row ) { $lb->add( $row->pt_namespace, $row->pt_title ); } @@ -208,12 +228,3 @@ class ProtectedtitlesPager extends AlphabeticPager { } } -/** - * Constructor - */ -function wfSpecialProtectedtitles() { - - $ppForm = new ProtectedTitlesForm(); - - $ppForm->showList(); -} -- cgit v1.2.3-54-g00ecf