From 11f5ebec28fc527a73ac2f9de7578a660e137561 Mon Sep 17 00:00:00 2001
From: Alex Monk <krenair@gmail.com>
Date: Mon, 6 Jul 2015 21:30:32 +0100
Subject: [PATCH] MovePage: Don't try to pass non-strings into
 Title::newFromText

Bug: T104852
Change-Id: I240c0993977a8e7e584b93e95ace0907f7b7825c
---
 includes/specials/SpecialMovepage.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index ae1fefea20..5682657a45 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -28,7 +28,7 @@
  */
 class MovePageForm extends UnlistedSpecialPage {
 	/** @var Title */
-	protected $oldTitle;
+	protected $oldTitle = null;
 
 	/** @var Title */
 	protected $newTitle;
@@ -75,9 +75,12 @@ class MovePageForm extends UnlistedSpecialPage {
 		// Yes, the use of getVal() and getText() is wanted, see bug 20365
 
 		$oldTitleText = $request->getVal( 'wpOldTitle', $target );
-		$this->oldTitle = Title::newFromText( $oldTitleText );
+		if ( is_string( $oldTitleText ) ) {
+			$this->oldTitle = Title::newFromText( $oldTitleText );
+		}
 
-		if ( is_null( $this->oldTitle ) ) {
+		if ( $this->oldTitle === null ) {
+			// Either oldTitle wasn't passed, or newFromText returned null
 			throw new ErrorPageError( 'notargettitle', 'notargettext' );
 		}
 		if ( !$this->oldTitle->exists() ) {
-- 
2.20.1