From: Jack Phoenix <ashley@uncyclomedia.co>
Date: Fri, 13 Jul 2018 03:33:10 +0000 (+0300)
Subject: Don't throw E_NOTICEs about undefined properties
X-Git-Tag: 1.34.0-rc.0~4768^2
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=83164669a140717797953f07baaf0b3239689017;p=lhc%2Fweb%2Fwiklou.git

Don't throw E_NOTICEs about undefined properties

Bug: T199494
Change-Id: Id24b9ece76ca0bedcaac29f1a6f5567af78658c1
---

diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index e066300c58..3fa30cbd39 100644
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -75,12 +75,12 @@ class RemoveUnusedAccounts extends Maintenance {
 			# group or if it's touched within the $touchedSeconds seconds.
 			$instance = User::newFromId( $row->user_id );
 			if ( count( array_intersect( $instance->getEffectiveGroups(), $excludedGroups ) ) == 0
-				&& $this->isInactiveAccount( $row->user_id, $row->actor_id, true )
+				&& $this->isInactiveAccount( $row->user_id, $row->actor_id ?? null, true )
 				&& wfTimestamp( TS_UNIX, $row->user_touched ) < wfTimestamp( TS_UNIX, time() - $touchedSeconds )
 			) {
 				# Inactive; print out the name and flag it
 				$delUser[] = $row->user_id;
-				if ( $row->actor_id ) {
+				if ( isset( $row->actor_id ) && $row->actor_id ) {
 					$delActor[] = $row->actor_id;
 				}
 				$this->output( $row->user_name . "\n" );
@@ -138,7 +138,7 @@ class RemoveUnusedAccounts extends Maintenance {
 	 * (No edits, no deleted edits, no log entries, no current/old uploads)
 	 *
 	 * @param int $id User's ID
-	 * @param int $actor User's actor ID
+	 * @param int|null $actor User's actor ID
 	 * @param bool $master Perform checking on the master
 	 * @return bool
 	 */