From: umherirrender <umherirrender_de.wp@web.de>
Date: Mon, 13 Apr 2015 19:31:49 +0000 (+0200)
Subject: Handle missing returnto on Special:ChangePassword/ConfirmEmail
X-Git-Tag: 1.31.0-rc.0~11721^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=228d9855e5954192f39ad81ac3a6bddd4ed5f104;p=lhc%2Fweb%2Fwiklou.git

Handle missing returnto on Special:ChangePassword/ConfirmEmail

A missing returnto results in a null passed to Title::newFromText which
gives a warning:
Notice: Title::newFromText: $text must be a string. This will throw an
InvalidArgumentException in future

Follow-Up: I2b36b7a3b96b37e29fe06f69c13a185b3ec592a7
Change-Id: I95e6023a2630cbae69f25d63611ebafb8b2bd74c
---

diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php
index eca307d9a1..3ed3c04eba 100644
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -129,7 +129,8 @@ class SpecialChangeEmail extends FormSpecialPage {
 	public function onSuccess() {
 		$request = $this->getRequest();
 
-		$titleObj = Title::newFromText( $request->getVal( 'returnto' ) );
+		$returnto = $request->getVal( 'returnto' );
+		$titleObj = $returnto !== null ? Title::newFromText( $returnto ) : null;
 		if ( !$titleObj instanceof Title ) {
 			$titleObj = Title::newMainPage();
 		}
diff --git a/includes/specials/SpecialChangePassword.php b/includes/specials/SpecialChangePassword.php
index 168095f8ca..6a4347df97 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -179,7 +179,8 @@ class SpecialChangePassword extends FormSpecialPage {
 		}
 
 		if ( $request->getCheck( 'wpCancel' ) ) {
-			$titleObj = Title::newFromText( $request->getVal( 'returnto' ) );
+			$returnto = $request->getVal( 'returnto' );
+			$titleObj = $returnto !== null ? Title::newFromText( $returnto ) : null;
 			if ( !$titleObj instanceof Title ) {
 				$titleObj = Title::newMainPage();
 			}