From: Joas Schilling <coding@schilljs.com>
Date: Tue, 30 Apr 2019 10:08:10 +0000 (+0200)
Subject: Fix detection of Notifiers
X-Git-Tag: v17.0.0beta1~135^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=865c12aa0e624d21d15b351ee5fcbedffa55f11c;p=nextcloud-server.git

Fix detection of Notifiers

Signed-off-by: Joas Schilling <coding@schilljs.com>
---

diff --git a/lib/private/Notification/Manager.php b/lib/private/Notification/Manager.php
index df54265a7ad..2ed7aa7c176 100644
--- a/lib/private/Notification/Manager.php
+++ b/lib/private/Notification/Manager.php
@@ -43,22 +43,14 @@ class Manager implements IManager {
 
 	/** @var IApp[] */
 	protected $apps;
-
-	/** @var INotifier[] */
-	protected $notifiers;
-
-	/** @var array[] */
-	protected $notifiersInfo;
-
 	/** @var string[] */
 	protected $appClasses;
 
+	/** @var INotifier[] */
+	protected $notifiers;
 	/** @var string[] */
 	protected $notifierClasses;
 
-	/** @var \Closure[] */
-	protected $notifiersInfoClosures;
-
 	/** @var bool */
 	protected $preparingPushNotification;
 
@@ -167,7 +159,7 @@ class Manager implements IManager {
 	 * @since 8.2.0
 	 */
 	public function hasNotifiers(): bool {
-		return !empty($this->notifiersClosures);
+		return !empty($this->notifiers) || !empty($this->notifierClasses);
 	}
 
 	/**