Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 37 insertions, 49 deletions

diff --git a/includes/specials/SpecialDoubleRedirects.php b/includes/specials/SpecialDoubleRedirects.php
index c7f63210..ec899d8a 100644
--- a/includes/specials/SpecialDoubleRedirects.php
+++ b/includes/specials/SpecialDoubleRedirects.php
@@ -29,63 +29,63 @@
  */
 class DoubleRedirectsPage extends PageQueryPage {
 
-	function getName() {
-		return 'DoubleRedirects';
+	function __construct( $name = 'DoubleRedirects' ) {
+		parent::__construct( $name );
 	}
 
-	function isExpensive( ) { return true; }
+	function isExpensive() { return true; }
 	function isSyndicated() { return false; }
+	function sortDescending() { return false; }
 
-	function getPageHeader( ) {
+	function getPageHeader() {
 		return wfMsgExt( 'doubleredirectstext', array( 'parse' ) );
 	}
 
-	function getSQLText( &$dbr, $namespace = null, $title = null ) {
-
-		list( $page, $redirect ) = $dbr->tableNamesN( 'page', 'redirect' );
-
+	function reallyGetQueryInfo( $namespace = null, $title = null ) {
 		$limitToTitle = !( $namespace === null && $title === null );
-		$sql = $limitToTitle ? "SELECT" : "SELECT 'DoubleRedirects' as type," ;
-		$sql .=
-			 " pa.page_namespace as namespace, pa.page_title as title," .
-			 " pb.page_namespace as nsb, pb.page_title as tb," .
-			 " pc.page_namespace as nsc, pc.page_title as tc" .
-		   " FROM $redirect AS ra, $redirect AS rb, $page AS pa, $page AS pb, $page AS pc" .
-		   " WHERE ra.rd_from=pa.page_id" .
-			 " AND ra.rd_namespace=pb.page_namespace" .
-			 " AND ra.rd_title=pb.page_title" .
-			 " AND rb.rd_from=pb.page_id" .
-			 " AND rb.rd_namespace=pc.page_namespace" .
-			 " AND rb.rd_title=pc.page_title";
-
-		if( $limitToTitle ) {
-			$encTitle = $dbr->addQuotes( $title );
-			$sql .= " AND pa.page_namespace=$namespace" .
-					" AND pa.page_title=$encTitle";
+		$retval = array (
+			'tables' => array ( 'ra' => 'redirect',
+					'rb' => 'redirect', 'pa' => 'page',
+					'pb' => 'page', 'pc' => 'page' ),
+			'fields' => array ( 'pa.page_namespace AS namespace',
+					'pa.page_title AS title',
+					'pb.page_namespace AS nsb',
+					'pb.page_title AS tb',
+					'pc.page_namespace AS nsc',
+					'pc.page_title AS tc' ),
+			'conds' => array ( 'ra.rd_from = pa.page_id',
+					'pb.page_namespace = ra.rd_namespace',
+					'pb.page_title = ra.rd_title',
+					'rb.rd_from = pb.page_id',
+					'pc.page_namespace = rb.rd_namespace',
+					'pc.page_title = rb.rd_title' )
+		);
+		if ( $limitToTitle ) {
+			$retval['conds']['pa.page_namespace'] = $namespace;
+			$retval['conds']['pa.page_title'] = $title;
 		}
-
-		return $sql;
+		return $retval;
 	}
 
-	function getSQL() {
-		$dbr = wfGetDB( DB_SLAVE );
-		return $this->getSQLText( $dbr );
+	function getQueryInfo() {
+		return $this->reallyGetQueryInfo();
 	}
 
-	function getOrder() {
-		return '';
+	function getOrderFields() {
+		return array ( 'ra.rd_namespace', 'ra.rd_title' );
 	}
 
 	function formatResult( $skin, $result ) {
-		global $wgContLang;
+		global $wgLang;
 
-		$fname = 'DoubleRedirectsPage::formatResult';
 		$titleA = Title::makeTitle( $result->namespace, $result->title );
 
 		if ( $result && !isset( $result->nsb ) ) {
 			$dbr = wfGetDB( DB_SLAVE );
-			$sql = $this->getSQLText( $dbr, $result->namespace, $result->title );
-			$res = $dbr->query( $sql, $fname );
+			$qi = $this->reallyGetQueryInfo( $result->namespace,
+					$result->title );
+			$res = $dbr->select($qi['tables'], $qi['fields'],
+					$qi['conds'], __METHOD__ );
 			if ( $res ) {
 				$result = $dbr->fetchObject( $res );
 			}
@@ -119,20 +119,8 @@ class DoubleRedirectsPage extends PageQueryPage {
 			array( 'redirect' => 'no' )
 		);
 		$linkC = $skin->linkKnown( $titleC );
-		$arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
+		$arr = $wgLang->getArrow() . $wgLang->getDirMark();
 
 		return( "{$linkA} {$edit} {$arr} {$linkB} {$arr} {$linkC}" );
 	}
 }
-
-/**
- * constructor
- */
-function wfSpecialDoubleRedirects() {
-	list( $limit, $offset ) = wfCheckLimits();
-
-	$sdr = new DoubleRedirectsPage();
-
-	return $sdr->doQuery( $offset, $limit );
-
-}