update to MediaWiki 1.16.0

1 files changed, 182 insertions, 156 deletions

diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php
index 1b1fe639..648da069 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -23,9 +23,9 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-if (!defined('MEDIAWIKI')) {
+if ( !defined( 'MEDIAWIKI' ) ) {
 	// Eclipse helper - will be ignored in production
-	require_once ("ApiQueryBase.php");
+	require_once ( "ApiQueryBase.php" );
 }
 
 /**
@@ -61,18 +61,18 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		)
 	);
 
-	public function __construct($query, $moduleName) {
-		extract($this->backlinksSettings[$moduleName]);
+	public function __construct( $query, $moduleName ) {
+		extract( $this->backlinksSettings[$moduleName] );
 		$this->resultArr = array();
 
-		parent :: __construct($query, $moduleName, $code);
+		parent :: __construct( $query, $moduleName, $code );
 		$this->bl_ns = $prefix . '_namespace';
 		$this->bl_from = $prefix . '_from';
 		$this->bl_table = $linktbl;
 		$this->bl_code = $code;
 
 		$this->hasNS = $moduleName !== 'imageusage';
-		if ($this->hasNS) {
+		if ( $this->hasNS ) {
 			$this->bl_title = $prefix . '_title';
 			$this->bl_sort = "{$this->bl_ns}, {$this->bl_title}, {$this->bl_from}";
 			$this->bl_fields = array (
@@ -96,210 +96,223 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		return 'public';
 	}
 
-	public function executeGenerator($resultPageSet) {
-		$this->run($resultPageSet);
+	public function executeGenerator( $resultPageSet ) {
+		$this->run( $resultPageSet );
 	}
 
-	private function prepareFirstQuery($resultPageSet = null) {
+	private function prepareFirstQuery( $resultPageSet = null ) {
 		/* SELECT page_id, page_title, page_namespace, page_is_redirect
 		 * FROM pagelinks, page WHERE pl_from=page_id
 		 * AND pl_title='Foo' AND pl_namespace=0
 		 * LIMIT 11 ORDER BY pl_from
 		 */
 		$db = $this->getDB();
-		$this->addTables(array('page', $this->bl_table));
-		$this->addWhere("{$this->bl_from}=page_id");
-		if(is_null($resultPageSet))
-			$this->addFields(array('page_id', 'page_title', 'page_namespace'));
+		$this->addTables( array( $this->bl_table, 'page' ) );
+		$this->addWhere( "{$this->bl_from}=page_id" );
+		if ( is_null( $resultPageSet ) )
+			$this->addFields( array( 'page_id', 'page_title', 'page_namespace' ) );
 		else
-			$this->addFields($resultPageSet->getPageTableFields());
-		$this->addFields('page_is_redirect');
-		$this->addWhereFld($this->bl_title, $this->rootTitle->getDBKey());
-		if($this->hasNS)
-			$this->addWhereFld($this->bl_ns, $this->rootTitle->getNamespace());
-		$this->addWhereFld('page_namespace', $this->params['namespace']);
-		if(!is_null($this->contID))
-			$this->addWhere("{$this->bl_from}>={$this->contID}");
-		if($this->params['filterredir'] == 'redirects')
-			$this->addWhereFld('page_is_redirect', 1);
-		if($this->params['filterredir'] == 'nonredirects')
-			$this->addWhereFld('page_is_redirect', 0);
-		$this->addOption('LIMIT', $this->params['limit'] + 1);
-		$this->addOption('ORDER BY', $this->bl_from);
+			$this->addFields( $resultPageSet->getPageTableFields() );
+
+		$this->addFields( 'page_is_redirect' );
+		$this->addWhereFld( $this->bl_title, $this->rootTitle->getDBkey() );
+
+		if ( $this->hasNS )
+			$this->addWhereFld( $this->bl_ns, $this->rootTitle->getNamespace() );
+		$this->addWhereFld( 'page_namespace', $this->params['namespace'] );
+
+		if ( !is_null( $this->contID ) )
+			$this->addWhere( "{$this->bl_from}>={$this->contID}" );
+
+		if ( $this->params['filterredir'] == 'redirects' )
+			$this->addWhereFld( 'page_is_redirect', 1 );
+		else if ( $this->params['filterredir'] == 'nonredirects' && !$this->redirect )
+			// bug 22245 - Check for !redirect, as filtering nonredirects, when getting what links to them is contradictory
+			$this->addWhereFld( 'page_is_redirect', 0 );
+
+		$this->addOption( 'LIMIT', $this->params['limit'] + 1 );
+		$this->addOption( 'ORDER BY', $this->bl_from );
+		$this->addOption( 'STRAIGHT_JOIN' );
 	}
 
-	private function prepareSecondQuery($resultPageSet = null) {
+	private function prepareSecondQuery( $resultPageSet = null ) {
 		/* SELECT page_id, page_title, page_namespace, page_is_redirect, pl_title, pl_namespace
 		   FROM pagelinks, page WHERE pl_from=page_id
 		   AND (pl_title='Foo' AND pl_namespace=0) OR (pl_title='Bar' AND pl_namespace=1)
 		   ORDER BY pl_namespace, pl_title, pl_from LIMIT 11
 		 */
 		$db = $this->getDB();
-		$this->addTables(array('page', $this->bl_table));
-		$this->addWhere("{$this->bl_from}=page_id");
-		if(is_null($resultPageSet))
-			$this->addFields(array('page_id', 'page_title', 'page_namespace', 'page_is_redirect'));
+		$this->addTables( array( 'page', $this->bl_table ) );
+		$this->addWhere( "{$this->bl_from}=page_id" );
+
+		if ( is_null( $resultPageSet ) )
+			$this->addFields( array( 'page_id', 'page_title', 'page_namespace', 'page_is_redirect' ) );
 		else
-			$this->addFields($resultPageSet->getPageTableFields());
-		$this->addFields($this->bl_title);
-		if($this->hasNS)
-			$this->addFields($this->bl_ns);
+			$this->addFields( $resultPageSet->getPageTableFields() );
+
+		$this->addFields( $this->bl_title );
+		if ( $this->hasNS )
+			$this->addFields( $this->bl_ns );
+
 		// We can't use LinkBatch here because $this->hasNS may be false
 		$titleWhere = array();
-		foreach($this->redirTitles as $t)
-			$titleWhere[] = "{$this->bl_title} = ".$db->addQuotes($t->getDBKey()).
-					($this->hasNS ? " AND {$this->bl_ns} = '{$t->getNamespace()}'" : "");
-		$this->addWhere($db->makeList($titleWhere, LIST_OR));
-		$this->addWhereFld('page_namespace', $this->params['namespace']);
-		if(!is_null($this->redirID))
+		foreach ( $this->redirTitles as $t )
+			$titleWhere[] = "{$this->bl_title} = " . $db->addQuotes( $t->getDBkey() ) .
+					( $this->hasNS ? " AND {$this->bl_ns} = '{$t->getNamespace()}'" : "" );
+		$this->addWhere( $db->makeList( $titleWhere, LIST_OR ) );
+		$this->addWhereFld( 'page_namespace', $this->params['namespace'] );
+
+		if ( !is_null( $this->redirID ) )
 		{
 			$first = $this->redirTitles[0];
-			$title = $db->strencode($first->getDBKey());
+			$title = $db->strencode( $first->getDBkey() );
 			$ns = $first->getNamespace();
 			$from = $this->redirID;
-			if($this->hasNS)
-				$this->addWhere("{$this->bl_ns} > $ns OR ".
-						"({$this->bl_ns} = $ns AND ".
-						"({$this->bl_title} > '$title' OR ".
-						"({$this->bl_title} = '$title' AND ".
-						"{$this->bl_from} >= $from)))");
+			if ( $this->hasNS )
+				$this->addWhere( "{$this->bl_ns} > $ns OR " .
+						"({$this->bl_ns} = $ns AND " .
+						"({$this->bl_title} > '$title' OR " .
+						"({$this->bl_title} = '$title' AND " .
+						"{$this->bl_from} >= $from)))" );
 			else
-				$this->addWhere("{$this->bl_title} > '$title' OR ".
-						"({$this->bl_title} = '$title' AND ".
-						"{$this->bl_from} >= $from)");
+				$this->addWhere( "{$this->bl_title} > '$title' OR " .
+						"({$this->bl_title} = '$title' AND " .
+						"{$this->bl_from} >= $from)" );
 				
 		}
-		if($this->params['filterredir'] == 'redirects')
-			$this->addWhereFld('page_is_redirect', 1);
-		if($this->params['filterredir'] == 'nonredirects')
-			$this->addWhereFld('page_is_redirect', 0);
-		$this->addOption('LIMIT', $this->params['limit'] + 1);
-		$this->addOption('ORDER BY', $this->bl_sort);
-		$this->addOption('USE INDEX', array('page' => 'PRIMARY'));
+		if ( $this->params['filterredir'] == 'redirects' )
+			$this->addWhereFld( 'page_is_redirect', 1 );
+		else if ( $this->params['filterredir'] == 'nonredirects' )
+			$this->addWhereFld( 'page_is_redirect', 0 );
+
+		$this->addOption( 'LIMIT', $this->params['limit'] + 1 );
+		$this->addOption( 'ORDER BY', $this->bl_sort );
+		$this->addOption( 'USE INDEX', array( 'page' => 'PRIMARY' ) );
 	}
 
-	private function run($resultPageSet = null) {
-		$this->params = $this->extractRequestParams(false);
-		$this->redirect = isset($this->params['redirect']) && $this->params['redirect'];
-		$userMax = ( $this->redirect ? ApiBase::LIMIT_BIG1/2 : ApiBase::LIMIT_BIG1 );
-		$botMax  = ( $this->redirect ? ApiBase::LIMIT_BIG2/2 : ApiBase::LIMIT_BIG2 );
-		if( $this->params['limit'] == 'max' ) {
+	private function run( $resultPageSet = null ) {
+		$this->params = $this->extractRequestParams( false );
+		$this->redirect = isset( $this->params['redirect'] ) && $this->params['redirect'];
+		$userMax = ( $this->redirect ? ApiBase::LIMIT_BIG1 / 2 : ApiBase::LIMIT_BIG1 );
+		$botMax  = ( $this->redirect ? ApiBase::LIMIT_BIG2 / 2 : ApiBase::LIMIT_BIG2 );
+		if ( $this->params['limit'] == 'max' ) {
 			$this->params['limit'] = $this->getMain()->canApiHighLimits() ? $botMax : $userMax;
 			$this->getResult()->addValue( 'limits', $this->getModuleName(), $this->params['limit'] );
 		}
 
 		$this->processContinue();
-		$this->prepareFirstQuery($resultPageSet);
+		$this->prepareFirstQuery( $resultPageSet );
 
 		$db = $this->getDB();
-		$res = $this->select(__METHOD__.'::firstQuery');
+		$res = $this->select( __METHOD__ . '::firstQuery' );
 
 		$count = 0;
 		$this->pageMap = array(); // Maps ns and title to pageid
 		$this->continueStr = null;
 		$this->redirTitles = array();
-		while ($row = $db->fetchObject($res)) {
-			if (++ $count > $this->params['limit']) {
+		while ( $row = $db->fetchObject( $res ) ) {
+			if ( ++ $count > $this->params['limit'] ) {
 				// We've reached the one extra which shows that there are additional pages to be had. Stop here...
 				// Continue string preserved in case the redirect query doesn't pass the limit
-				$this->continueStr = $this->getContinueStr($row->page_id);
+				$this->continueStr = $this->getContinueStr( $row->page_id );
 				break;
 			}
 
-			if (is_null($resultPageSet))
-				$this->extractRowInfo($row);
+			if ( is_null( $resultPageSet ) )
+				$this->extractRowInfo( $row );
 			else
 			{
 				$this->pageMap[$row->page_namespace][$row->page_title] = $row->page_id;
-				if($row->page_is_redirect)
-					$this->redirTitles[] = Title::makeTitle($row->page_namespace, $row->page_title);
-				$resultPageSet->processDbRow($row);
+				if ( $row->page_is_redirect )
+					$this->redirTitles[] = Title::makeTitle( $row->page_namespace, $row->page_title );
+
+				$resultPageSet->processDbRow( $row );
 			}
 		}
-		$db->freeResult($res);
+		$db->freeResult( $res );
 
-		if($this->redirect && count($this->redirTitles))
+		if ( $this->redirect && count( $this->redirTitles ) )
 		{
 			$this->resetQueryParams();
-			$this->prepareSecondQuery($resultPageSet);
-			$res = $this->select(__METHOD__.'::secondQuery');
+			$this->prepareSecondQuery( $resultPageSet );
+			$res = $this->select( __METHOD__ . '::secondQuery' );
 			$count = 0;
-			while($row = $db->fetchObject($res))
+			while ( $row = $db->fetchObject( $res ) )
 			{
-				if(++$count > $this->params['limit'])
+				if ( ++$count > $this->params['limit'] )
 				{
 					// We've reached the one extra which shows that there are additional pages to be had. Stop here...
 					// We need to keep the parent page of this redir in
-					if($this->hasNS)
-						$parentID = $this->pageMap[$row->{$this->bl_ns}][$row->{$this->bl_title}];
+					if ( $this->hasNS )
+						$parentID = $this->pageMap[$row-> { $this->bl_ns } ][$row-> { $this->bl_title } ];
 					else
-						$parentID = $this->pageMap[NS_IMAGE][$row->{$this->bl_title}];
-						$this->continueStr = $this->getContinueRedirStr($parentID, $row->page_id);
+						$parentID = $this->pageMap[NS_IMAGE][$row-> { $this->bl_title } ];
+					$this->continueStr = $this->getContinueRedirStr( $parentID, $row->page_id );
 					break;
 				}
 
-				if(is_null($resultPageSet))
-					$this->extractRedirRowInfo($row);
+				if ( is_null( $resultPageSet ) )
+					$this->extractRedirRowInfo( $row );
 				else
-					$resultPageSet->processDbRow($row);
+					$resultPageSet->processDbRow( $row );
 			}
-			$db->freeResult($res);
+			$db->freeResult( $res );
 		}
-		if (is_null($resultPageSet)) {
+		if ( is_null( $resultPageSet ) ) {
 			// Try to add the result data in one go and pray that it fits
-			$fit = $this->getResult()->addValue('query', $this->getModuleName(), array_values($this->resultArr));
-			if(!$fit)
+			$fit = $this->getResult()->addValue( 'query', $this->getModuleName(), array_values( $this->resultArr ) );
+			if ( !$fit )
 			{
 				// It didn't fit. Add elements one by one until the
 				// result is full.
-				foreach($this->resultArr as $pageID => $arr)
+				foreach ( $this->resultArr as $pageID => $arr )
 				{
 					// Add the basic entry without redirlinks first
 					$fit = $this->getResult()->addValue(
-						array('query', $this->getModuleName()),
-						null, array_diff_key($arr, array('redirlinks' => '')));
-					if(!$fit)
+						array( 'query', $this->getModuleName() ),
+						null, array_diff_key( $arr, array( 'redirlinks' => '' ) ) );
+					if ( !$fit )
 					{
-						$this->continueStr = $this->getContinueStr($pageID);
+						$this->continueStr = $this->getContinueStr( $pageID );
 						break;
 					}
 
 					$hasRedirs = false;
-					foreach((array)@$arr['redirlinks'] as $key => $redir)
+					foreach ( (array)@$arr['redirlinks'] as $key => $redir )
 					{
 						$fit = $this->getResult()->addValue(
-							array('query', $this->getModuleName(), $pageID, 'redirlinks'),
-							$key, $redir);
-						if(!$fit)
+							array( 'query', $this->getModuleName(), $pageID, 'redirlinks' ),
+							$key, $redir );
+						if ( !$fit )
 						{
-							$this->continueStr = $this->getContinueRedirStr($pageID, $redir['pageid']);
+							$this->continueStr = $this->getContinueRedirStr( $pageID, $redir['pageid'] );
 							break;
 						}
 						$hasRedirs = true;
 					}
-					if($hasRedirs)
+					if ( $hasRedirs )
 						$this->getResult()->setIndexedTagName_internal(
-							array('query', $this->getModuleName(), $pageID, 'redirlinks'),
-							$this->bl_code);
-					if(!$fit)
+							array( 'query', $this->getModuleName(), $pageID, 'redirlinks' ),
+							$this->bl_code );
+					if ( !$fit )
 						break;
 				}
-			}		
+			}
 
 			$this->getResult()->setIndexedTagName_internal(
-					 array('query', $this->getModuleName()),
-					 $this->bl_code);
+					 array( 'query', $this->getModuleName() ),
+					 $this->bl_code );
 		}
-		if(!is_null($this->continueStr))
-			$this->setContinueEnumParameter('continue', $this->continueStr);
+		if ( !is_null( $this->continueStr ) )
+			$this->setContinueEnumParameter( 'continue', $this->continueStr );
 	}
 
-	private function extractRowInfo($row) {
+	private function extractRowInfo( $row ) {
 		$this->pageMap[$row->page_namespace][$row->page_title] = $row->page_id;
-		$t = Title::makeTitle($row->page_namespace, $row->page_title);
-		$a = array('pageid' => intval($row->page_id));
-		ApiQueryBase::addTitleInfo($a, $t);
-		if($row->page_is_redirect)
+		$t = Title::makeTitle( $row->page_namespace, $row->page_title );
+		$a = array( 'pageid' => intval( $row->page_id ) );
+		ApiQueryBase::addTitleInfo( $a, $t );
+		if ( $row->page_is_redirect )
 		{
 			$a['redirect'] = '';
 			$this->redirTitles[] = $t;
@@ -308,42 +321,42 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		$this->resultArr[$a['pageid']] = $a;
 	}
 
-	private function extractRedirRowInfo($row)
+	private function extractRedirRowInfo( $row )
 	{
-		$a['pageid'] = intval($row->page_id);
-		ApiQueryBase::addTitleInfo($a, Title::makeTitle($row->page_namespace, $row->page_title));
-		if($row->page_is_redirect)
+		$a['pageid'] = intval( $row->page_id );
+		ApiQueryBase::addTitleInfo( $a, Title::makeTitle( $row->page_namespace, $row->page_title ) );
+		if ( $row->page_is_redirect )
 			$a['redirect'] = '';
-		$ns = $this->hasNS ? $row->{$this->bl_ns} : NS_FILE;
-		$parentID = $this->pageMap[$ns][$row->{$this->bl_title}];
+		$ns = $this->hasNS ? $row-> { $this->bl_ns } : NS_FILE;
+		$parentID = $this->pageMap[$ns][$row-> { $this->bl_title } ];
 		// Put all the results in an array first
 		$this->resultArr[$parentID]['redirlinks'][] = $a;
-		$this->getResult()->setIndexedTagName($this->resultArr[$parentID]['redirlinks'], $this->bl_code);
+		$this->getResult()->setIndexedTagName( $this->resultArr[$parentID]['redirlinks'], $this->bl_code );
 	}
 
 	protected function processContinue() {
-		if (!is_null($this->params['continue']))
+		if ( !is_null( $this->params['continue'] ) )
 			$this->parseContinueParam();
 		else {
 			if ( $this->params['title'] !== "" ) {
 				$title = Title::newFromText( $this->params['title'] );
 				if ( !$title ) {
-					$this->dieUsageMsg(array('invalidtitle', $this->params['title']));
+					$this->dieUsageMsg( array( 'invalidtitle', $this->params['title'] ) );
 				} else {
 					$this->rootTitle = $title;
 				}
 			} else {
-				$this->dieUsageMsg(array('missingparam', 'title'));
+				$this->dieUsageMsg( array( 'missingparam', 'title' ) );
 			}
 		}
 
 		// only image titles are allowed for the root in imageinfo mode
-		if (!$this->hasNS && $this->rootTitle->getNamespace() !== NS_FILE)
-			$this->dieUsage("The title for {$this->getModuleName()} query must be an image", 'bad_image_title');
+		if ( !$this->hasNS && $this->rootTitle->getNamespace() !== NS_FILE )
+			$this->dieUsage( "The title for {$this->getModuleName()} query must be an image", 'bad_image_title' );
 	}
 
 	protected function parseContinueParam() {
-		$continueList = explode('|', $this->params['continue']);
+		$continueList = explode( '|', $this->params['continue'] );
 		// expected format:
 		// ns | key | id1 [| id2]
 		// ns+key: root title
@@ -352,33 +365,36 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 
 		// null stuff out now so we know what's set and what isn't
 		$this->rootTitle = $this->contID = $this->redirID = null;
-		$rootNs = intval($continueList[0]);
-		if($rootNs === 0 && $continueList[0] !== '0')
+		$rootNs = intval( $continueList[0] );
+		if ( $rootNs === 0 && $continueList[0] !== '0' )
 			// Illegal continue parameter
-			$this->dieUsage("Invalid continue param. You should pass the original value returned by the previous query", "_badcontinue");
-		$this->rootTitle = Title::makeTitleSafe($rootNs, $continueList[1]);
-		if(!$this->rootTitle)
-			$this->dieUsage("Invalid continue param. You should pass the original value returned by the previous query", "_badcontinue");
-		$contID = intval($continueList[2]);
-		if($contID === 0 && $continueList[2] !== '0')
-			$this->dieUsage("Invalid continue param. You should pass the original value returned by the previous query", "_badcontinue");
+			$this->dieUsage( "Invalid continue param. You should pass the original value returned by the previous query", "_badcontinue" );
+		$this->rootTitle = Title::makeTitleSafe( $rootNs, $continueList[1] );
+
+		if ( !$this->rootTitle )
+			$this->dieUsage( "Invalid continue param. You should pass the original value returned by the previous query", "_badcontinue" );
+		$contID = intval( $continueList[2] );
+
+		if ( $contID === 0 && $continueList[2] !== '0' )
+			$this->dieUsage( "Invalid continue param. You should pass the original value returned by the previous query", "_badcontinue" );
 		$this->contID = $contID;
-		$redirID = intval(@$continueList[3]);
-		if($redirID === 0 && @$continueList[3] !== '0')
+		$redirID = intval( @$continueList[3] );
+		
+		if ( $redirID === 0 && @$continueList[3] !== '0' )
 			// This one isn't required
 			return;
 		$this->redirID = $redirID;
 
 	}
 
-	protected function getContinueStr($lastPageID) {
+	protected function getContinueStr( $lastPageID ) {
 		return $this->rootTitle->getNamespace() .
 		'|' . $this->rootTitle->getDBkey() .
 		'|' . $lastPageID;
 	}
 
-	protected function getContinueRedirStr($lastPageID, $lastRedirID) {
-		return $this->getContinueStr($lastPageID) . '|' . $lastRedirID;
+	protected function getContinueRedirStr( $lastPageID, $lastRedirID ) {
+		return $this->getContinueStr( $lastPageID ) . '|' . $lastRedirID;
 	}
 
 	public function getAllowedParams() {
@@ -405,7 +421,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 				ApiBase :: PARAM_MAX2 => ApiBase :: LIMIT_BIG2
 			)
 		);
-		if($this->getModuleName() == 'embeddedin')
+		if ( $this->getModuleName() == 'embeddedin' )
 			return $retval;
 		$retval['redirect'] = false;
 		return $retval;
@@ -413,23 +429,24 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 
 	public function getParamDescription() {
 		$retval = array (
-			'title' => 'Title to search. If null, titles= parameter will be used instead, but will be obsolete soon.',
+			'title' => 'Title to search.',
 			'continue' => 'When more results are available, use this to continue.',
 			'namespace' => 'The namespace to enumerate.',
-			'filterredir' => 'How to filter for redirects'
 		);
-		if($this->getModuleName() != 'embeddedin')
-			return array_merge($retval, array(
+		if ( $this->getModuleName() != 'embeddedin' )
+			return array_merge( $retval, array(
 				'redirect' => 'If linking page is a redirect, find all pages that link to that redirect as well. Maximum limit is halved.',
-				'limit' => "How many total pages to return. If {$this->bl_code}redirect is enabled, limit applies to each level separately."
-			));
-		return array_merge($retval, array(
-			'limit' => "How many total pages to return."
-		));
+				'filterredir' => "How to filter for redirects. If set to nonredirects when {$this->bl_code}redirect is enabled, this is only applied to the second level",
+				'limit' => "How many total pages to return. If {$this->bl_code}redirect is enabled, limit applies to each level separately (which means you may get up to 2 * limit results)."
+			) );
+		return array_merge( $retval, array(
+			'filterredir' => 'How to filter for redirects',
+			'limit' => 'How many total pages to return.'
+		) );
 	}
 
 	public function getDescription() {
-		switch ($this->getModuleName()) {
+		switch ( $this->getModuleName() ) {
 			case 'backlinks' :
 				return 'Find all pages that link to the given page';
 			case 'embeddedin' :
@@ -437,9 +454,18 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 			case 'imageusage' :
 				return 'Find all pages that use the given image title.';
 			default :
-				ApiBase :: dieDebug(__METHOD__, 'Unknown module name');
+				ApiBase :: dieDebug( __METHOD__, 'Unknown module name' );
 		}
 	}
+	
+	public function getPossibleErrors() {
+		return array_merge( parent::getPossibleErrors(), array(
+			array( 'invalidtitle', 'title' ),
+			array( 'missingparam', 'title' ),
+			array( 'code' => 'bad_image_title', 'info' => "The title for {$this->getModuleName()} query must be an image" ),
+			array( 'code' => '_badcontinue', 'info' => 'Invalid continue param. You should pass the original value returned by the previous query' ),
+		) );
+	}
 
 	protected function getExamples() {
 		static $examples = array (
@@ -461,6 +487,6 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBacklinks.php 69986 2010-07-27 03:57:39Z tstarling $';
+		return __CLASS__ . ': $Id: ApiQueryBacklinks.php 69932 2010-07-26 08:03:21Z tstarling $';
 	}
 }