[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Fixed possible fatal in LinkEnd hook handler
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372144 ) Change subject: BSFoundation: Fixed possible fatal in LinkEnd hook handler .. BSFoundation: Fixed possible fatal in LinkEnd hook handler * in rare cases $this->target->getText() returns '127.0.0.1' which results in 'false' in User::newFromName Change-Id: Ieb1db3038a9d113e908e5f27123f32876e6f3cdf --- M src/Hooks/LinkEnd/AddDataUserName.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/src/Hooks/LinkEnd/AddDataUserName.php b/src/Hooks/LinkEnd/AddDataUserName.php index 496268d..82acb92 100644 --- a/src/Hooks/LinkEnd/AddDataUserName.php +++ b/src/Hooks/LinkEnd/AddDataUserName.php @@ -9,6 +9,11 @@ } $user = \User::newFromName( $this->target->getText() ); + if( !$user ) { + //in rare cases $this->target->getText() returns '127.0.0.1' which + //results in 'false' in User::newFromName + return true; + } if( $this->target->getText() === $this->html ) { $this->html = htmlspecialchars( -- To view, visit https://gerrit.wikimedia.org/r/372144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb1db3038a9d113e908e5f27123f32876e6f3cdf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: PwirthGerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Fixed possible fatal in LinkEnd hook handler
Pwirth has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372144 ) Change subject: BSFoundation: Fixed possible fatal in LinkEnd hook handler .. BSFoundation: Fixed possible fatal in LinkEnd hook handler * in rare cases $this->target->getText() returns '127.0.0.1' which results in 'false' in User::newFromName Change-Id: Ieb1db3038a9d113e908e5f27123f32876e6f3cdf --- M src/Hooks/LinkEnd/AddDataUserName.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/44/372144/1 diff --git a/src/Hooks/LinkEnd/AddDataUserName.php b/src/Hooks/LinkEnd/AddDataUserName.php index 496268d..82acb92 100644 --- a/src/Hooks/LinkEnd/AddDataUserName.php +++ b/src/Hooks/LinkEnd/AddDataUserName.php @@ -9,6 +9,11 @@ } $user = \User::newFromName( $this->target->getText() ); + if( !$user ) { + //in rare cases $this->target->getText() returns '127.0.0.1' which + //results in 'false' in User::newFromName + return true; + } if( $this->target->getText() === $this->html ) { $this->html = htmlspecialchars( -- To view, visit https://gerrit.wikimedia.org/r/372144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb1db3038a9d113e908e5f27123f32876e6f3cdf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Pwirth___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits