1 files changed, 48 insertions, 20 deletions

diff --git a/includes/specials/SpecialCategories.php b/includes/specials/SpecialCategories.php
index eb49fdbc..c2dd40cd 100644
--- a/includes/specials/SpecialCategories.php
+++ b/includes/specials/SpecialCategories.php
@@ -1,29 +1,57 @@
 <?php
 /**
+ * Implements Special:Categories
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup SpecialPage
  */
 
-function wfSpecialCategories( $par=null ) {
-	global $wgOut, $wgRequest;
+/**
+ * @ingroup SpecialPage
+ */
+class SpecialCategories extends SpecialPage {
+
+	function __construct() {
+		parent::__construct( 'Categories' );
+	}
+
+	function execute( $par ) {
+		global $wgOut, $wgRequest;
+
+		$this->setHeaders();
+		$this->outputHeader();
+		$wgOut->allowClickjacking();
 
-	if( $par == '' ) {
-		$from = $wgRequest->getText( 'from' );
-	} else {
-		$from = $par;
+		$from = $wgRequest->getText( 'from', $par );
+
+		$cap = new CategoryPager( $from );
+		$cap->doQuery();
+
+		$wgOut->addHTML(
+			Html::openElement( 'div', array( 'class' => 'mw-spcontent' ) ) .
+			wfMsgExt( 'categoriespagetext', array( 'parse' ), $cap->getNumRows() ) .
+			$cap->getStartForm( $from ) .
+			$cap->getNavigationBar() .
+			'<ul>' . $cap->getBody() . '</ul>' .
+			$cap->getNavigationBar() .
+			Html::closeElement( 'div' )
+		);
 	}
-	$wgOut->allowClickjacking();
-	$cap = new CategoryPager( $from );
-	$cap->doQuery();
-	$wgOut->addHTML(
-		XML::openElement( 'div', array('class' => 'mw-spcontent') ) .
-		wfMsgExt( 'categoriespagetext', array( 'parse' ), $cap->getNumRows() ) .
-		$cap->getStartForm( $from ) .
-		$cap->getNavigationBar() .
-		'<ul>' . $cap->getBody() . '</ul>' .
-		$cap->getNavigationBar() .
-		XML::closeElement( 'div' )
-	);
 }
 
 /**
@@ -77,7 +105,7 @@ class CategoryPager extends AlphabeticPager {
 
 		$this->mResult->rewind();
 
-		while ( $row = $this->mResult->fetchObject() ) {
+		foreach ( $this->mResult as $row ) {
 			$batch->addObj( Title::makeTitleSafe( NS_CATEGORY, $row->cat_title ) );
 		}
 		$batch->execute();
@@ -100,7 +128,7 @@ class CategoryPager extends AlphabeticPager {
 	
 		return
 			Xml::tags( 'form', array( 'method' => 'get', 'action' => $wgScript ),
-				Xml::hidden( 'title', $t->getPrefixedText() ) .
+				Html::hidden( 'title', $t->getPrefixedText() ) .
 				Xml::fieldset( wfMsg( 'categories' ),
 					Xml::inputLabel( wfMsg( 'categoriesfrom' ),
 						'from', 'from', 20, $from ) .