Update to MediaWiki 1.21.1

1 files changed, 20 insertions, 26 deletions

diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index 862736d3..391c4a7f 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -29,7 +29,7 @@
 class SpecialRecentchangeslinked extends SpecialRecentChanges {
 	var $rclTargetTitle;
 
-	function __construct(){
+	function __construct() {
 		parent::__construct( 'Recentchangeslinked' );
 	}
 
@@ -37,7 +37,6 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 		$opts = parent::getDefaultOptions();
 		$opts->add( 'target', '' );
 		$opts->add( 'showlinkedto', false );
-		$opts->add( 'tagfilter', '' );
 		return $opts;
 	}
 
@@ -51,7 +50,7 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 		return $opts;
 	}
 
-	public function getFeedObject( $feedFormat ){
+	public function getFeedObject( $feedFormat ) {
 		$feed = new ChangesFeed( $feedFormat, false );
 		$feedObj = $feed->getFeedObject(
 			$this->msg( 'recentchangeslinked-title', $this->getTargetTitle()->getPrefixedText() )
@@ -72,7 +71,7 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 		}
 		$outputPage = $this->getOutput();
 		$title = Title::newFromURL( $target );
-		if( !$title || $title->getInterwiki() != '' ){
+		if( !$title || $title->getInterwiki() != '' ) {
 			$outputPage->wrapWikiMsg( "<div class=\"errorbox\">\n$1\n</div><br style=\"clear: both\" />", 'allpagesbadtitle' );
 			return false;
 		}
@@ -94,7 +93,7 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 		$dbkey = $title->getDBkey();
 
 		$tables = array( 'recentchanges' );
-		$select = array( $dbr->tableName( 'recentchanges' ) . '.*' );
+		$select = RecentChange::selectFields();
 		$join_conds = array();
 		$query_options = array();
 
@@ -103,11 +102,15 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 		if( $uid ) {
 			$tables[] = 'watchlist';
 			$select[] = 'wl_user';
-			$join_conds['watchlist'] = array( 'LEFT JOIN', "wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace" );
+			$join_conds['watchlist'] = array( 'LEFT JOIN', array(
+				'wl_user' => $uid,
+				'wl_title=rc_title',
+				'wl_namespace=rc_namespace'
+			));
 		}
 		if ( $this->getUser()->isAllowed( 'rollback' ) ) {
 			$tables[] = 'page';
-			$join_conds['page'] = array('LEFT JOIN', 'rc_cur_id=page_id');
+			$join_conds['page'] = array( 'LEFT JOIN', 'rc_cur_id=page_id' );
 			$select[] = 'page_latest';
 		}
 		ChangeTags::modifyDisplayQuery(
@@ -125,7 +128,7 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 
 		if( $ns == NS_CATEGORY && !$showlinkedto ) {
 			// special handling for categories
-			// XXX: should try to make this less klugy
+			// XXX: should try to make this less kludgy
 			$link_tables = array( 'categorylinks' );
 			$showlinkedto = true;
 		} else {
@@ -176,7 +179,7 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 					$subconds["rc_namespace"] = $link_ns;
 					$subjoin = "rc_title = {$pfx}_to";
 				} else {
-					$subjoin = "rc_namespace = {$pfx}_namespace AND rc_title = {$pfx}_title";
+					$subjoin = array( "rc_namespace = {$pfx}_namespace", "rc_title = {$pfx}_title" );
 				}
 			}
 
@@ -201,15 +204,15 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 			$subsql[] = $query;
 		}
 
-		if( count($subsql) == 0 ) {
+		if( count( $subsql ) == 0 ) {
 			return false; // should never happen
 		}
-		if( count($subsql) == 1 && $dbr->unionSupportsOrderAndLimit() ) {
+		if( count( $subsql ) == 1 && $dbr->unionSupportsOrderAndLimit() ) {
 			$sql = $subsql[0];
 		} else {
 			// need to resort and relimit after union
-			$sql = $dbr->unionQueries($subsql, false).' ORDER BY rc_timestamp DESC';
-			$sql = $dbr->limitResult($sql, $limit, false);
+			$sql = $dbr->unionQueries( $subsql, false ) . ' ORDER BY rc_timestamp DESC';
+			$sql = $dbr->limitResult( $sql, $limit, false );
 		}
 
 		$res = $dbr->query( $sql, __METHOD__ );
@@ -225,16 +228,16 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 	 * @param $opts FormOptions
 	 * @return array
 	 */
-	function getExtraOptions( $opts ){
+	function getExtraOptions( $opts ) {
 		$opts->consumeValues( array( 'showlinkedto', 'target', 'tagfilter' ) );
 		$extraOpts = array();
 		$extraOpts['namespace'] = $this->namespaceFilterForm( $opts );
 		$extraOpts['target'] = array( $this->msg( 'recentchangeslinked-page' )->escaped(),
-			Xml::input( 'target', 40, str_replace('_',' ',$opts['target']) ) .
-			Xml::check( 'showlinkedto', $opts['showlinkedto'], array('id' => 'showlinkedto') ) . ' ' .
+			Xml::input( 'target', 40, str_replace( '_', ' ', $opts['target'] ) ) .
+			Xml::check( 'showlinkedto', $opts['showlinkedto'], array( 'id' => 'showlinkedto' ) ) . ' ' .
 			Xml::label( $this->msg( 'recentchangeslinked-to' )->text(), 'showlinkedto' ) );
 		$tagFilter = ChangeTags::buildTagFilterSelector( $opts['tagfilter'] );
-		if ($tagFilter) {
+		if ( $tagFilter ) {
 			$extraOpts['tagfilter'] = $tagFilter;
 		}
 		return $extraOpts;
@@ -262,15 +265,6 @@ class SpecialRecentchangeslinked extends SpecialRecentChanges {
 		}
 	}
 
-	public function getFeedQuery() {
-		$target = $this->getTargetTitle();
-		if( $target ) {
-			return "target=" . urlencode( $target->getPrefixedDBkey() );
-		} else {
-			return false;
-		}
-	}
-
 	function setBottomText( FormOptions $opts ) {
 		if( isset( $this->mResultEmpty ) && $this->mResultEmpty ) {
 			$this->getOutput()->addWikiMsg( 'recentchangeslinked-noresult' );