jenkins-bot has submitted this change and it was merged.
Change subject: Handle missing returnto on Special:ChangePassword/ConfirmEmail
......................................................................
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
---
M includes/specials/SpecialChangeEmail.php
M includes/specials/SpecialChangePassword.php
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialChangeEmail.php
b/includes/specials/SpecialChangeEmail.php
index eca307d..3ed3c04 100644
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -129,7 +129,8 @@
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 168095f..6a4347d 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -179,7 +179,8 @@
}
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();
}
--
To view, visit https://gerrit.wikimedia.org/r/203885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95e6023a2630cbae69f25d63611ebafb8b2bd74c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
