From: Sam Reed <reedy@users.mediawiki.org>
Date: Wed, 7 Apr 2010 08:56:43 +0000 (+0000)
Subject: Fixup to r64197 per http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64197#c6451
X-Git-Tag: 1.31.0-rc.0~37230
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=2a557115f07bcc50240cbf11c8692b113c73f129;p=lhc%2Fweb%2Fwiklou.git

Fixup to r64197 per mediawiki.org/wiki/Special:Code/MediaWiki/64197#c6451

Pass $fromTitle rather than $titleObj (which is undefined)
---

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 21875deab6..7abfb9e162 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -534,6 +534,7 @@ abstract class ApiBase {
 
 		return $mValidNamespaces;
 	}
+
 	/**
 	* Handle watchlist settings
 	*/
diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 603ef5961d..464785973d 100644
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -123,7 +123,7 @@ class ApiMove extends ApiBase {
 		}
 		
 		// Watch pages
-		$watch = $this->getWatchlistValue( $params['watchlist'], $titleObj ) || $wgUser->getOption( 'watchmoves' );
+		$watch = $this->getWatchlistValue( $params['watchlist'], $fromTitle ) || $wgUser->getOption( 'watchmoves' );
 		
 		// Deprecated parameters
 		if ( $params['watch'] ) {