From 2a557115f07bcc50240cbf11c8692b113c73f129 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Wed, 7 Apr 2010 08:56:43 +0000 Subject: [PATCH] Fixup to r64197 per http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64197#c6451 Pass $fromTitle rather than $titleObj (which is undefined) --- includes/api/ApiBase.php | 1 + includes/api/ApiMove.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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'] ) { -- 2.20.1