jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371761 )
Change subject: Fix: Fatal on invalid username on API POST to Newsletter
EditPage
......................................................................
Fix: Fatal on invalid username on API POST to Newsletter EditPage
Was causing: PHP Catchable fatal error: Argument 1 passed to
LogFormatter::makeUserLink() must be an instance of User, boolean given,
called in /var/www/core/extensions/Newsletter/includes/logging/
NewsletterLogFormatter.php on line 23
Bug: T169412
Change-Id: I4693eef929d4ef00e87d288aa5d4a8514188685d
---
M includes/logging/NewsletterLogFormatter.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/logging/NewsletterLogFormatter.php
b/includes/logging/NewsletterLogFormatter.php
index 6878252..4025f07 100644
--- a/includes/logging/NewsletterLogFormatter.php
+++ b/includes/logging/NewsletterLogFormatter.php
@@ -20,8 +20,10 @@
$params = parent::getMessageParameters();
if ( $this->entry->getTarget()->inNamespace( NS_USER ) ) {
$user = User::newFromName(
$this->entry->getTarget()->getText() );
- $params[2] = Message::rawParam( $this->makeUserLink(
$user ) );
- $params[6] = $user->getName();
+ if ( $user ) {
+ $params[2] = Message::rawParam(
$this->makeUserLink( $user ) );
+ $params[6] = $user->getName();
+ }
}
if ( $this->entry->getSubtype() === 'issue-added' && isset(
$params[5] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/371761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4693eef929d4ef00e87d288aa5d4a8514188685d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
