Fix for web push stuff loading when notifications are disabled

iMattPro · iMattPro · commit 47e26eabcef7 · 2024-07-29T08:09:38.000-07:00
Signed-off-by: Matt Friedman &lt;maf675@gmail.com&gt;
diff --git a/notification/method/webpush.php b/notification/method/webpush.php
@@ -103,7 +103,7 @@ public function get_type(): string
 	*/
 	public function is_available(type_interface $notification_type = null): bool
 	{
-		return parent::is_available($notification_type) && $this->config['wpn_webpush_enable']
+		return parent::is_available($notification_type) && $this->config['allow_board_notifications'] && $this->config['wpn_webpush_enable']
 			&& !empty($this->config['wpn_webpush_vapid_public']) && !empty($this->config['wpn_webpush_vapid_private']);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function get_type(): string`
`103`	`103`	`*/`
`104`	`104`	`public function is_available(type_interface $notification_type = null): bool`
`105`	`105`	`{`
`106`		`- return parent::is_available($notification_type) && $this->config['wpn_webpush_enable']`
	`106`	`+ return parent::is_available($notification_type) && $this->config['allow_board_notifications'] && $this->config['wpn_webpush_enable']`
`107`	`107`	`&& !empty($this->config['wpn_webpush_vapid_public']) && !empty($this->config['wpn_webpush_vapid_private']);`
`108`	`108`	`}`
`109`	`109`