jenkins-bot has submitted this change and it was merged.

Change subject: Avoid fatal error when mentioning invalid user
......................................................................


Avoid fatal error when mentioning invalid user

Change-Id: I0447ca85ce152fa6ffab71069d25d781d919ce0e
---
M includes/Notifications/Controller.php
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index 36817da..20efe36 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -292,7 +292,10 @@
 
                $users = array();
                foreach ( $links[NS_USER] as $dbk => $page_id ) {
-                       $users[] = User::newFromName( $dbk );
+                       $user = User::newFromName( $dbk );
+                       if ( $user ) {
+                               $users[] = $user;
+                       }
                }
 
                return $users;
@@ -340,7 +343,10 @@
                case 'flow-new-topic':
                        $title = $event->getTitle();
                        if ( $title->getNamespace() == NS_USER_TALK ) {
-                               $users[] = User::newFromName( $title->getText() 
);
+                               $user = User::newFromName( $title->getText() );
+                               if ( $user ) {
+                                       $users[] = $user;
+                               }
                        }
                        break;
                case 'flow-topic-renamed':

-- 
To view, visit https://gerrit.wikimedia.org/r/97042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0447ca85ce152fa6ffab71069d25d781d919ce0e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to