Release Beta 5

humhub · Jul 14, 2023 · f82d321 · f82d321
1 parent 253e060
commit f82d321
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Events.php b/Events.php
@@ -38,15 +38,15 @@ public static function onManifestControllerInit($event)
         $controller->manifest['gcm_sender_id'] = (string)103953800507;
     }
 
-    public static function onServiceWorkerControllerInit($event)
+    public static function onServiceWorkerControllerInit($event): void
     {
         /** @var ServiceWorkerController $controller */
         $controller = $event->sender;
 
         /** @var Module $module */
         $module = Yii::$app->getModule('fcm-push');
 
-        if (!$module->getDriverService()->hasConfiguredDriver()) {
+        if (!$module->getDriverService()->hasConfiguredWebDriver()) {
             return;
         }
 
@@ -105,7 +105,7 @@ public static function onLayoutAddonInit($event)
         /** @var Module $module */
         $module = Yii::$app->getModule('fcm-push');
 
-        if (!$module->getDriverService()->hasConfiguredDriver()) {
+        if (!$module->getDriverService()->hasConfiguredWebDriver()) {
             return;
         }
 

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,10 @@
+2.0.0-beta.5 (July 14, 2023)
+----------------------------
+
+- Fix: Error when no Web Driver is configured.
+
+
+
 2.0.0-beta.4 (July 13, 2023)
 ----------------------------
 

diff --git a/module.json b/module.json
@@ -11,6 +11,6 @@
     "humhub": {
         "minVersion": "1.13"
     },
-    "version": "2.0.0-beta.4",
+    "version": "2.0.0-beta.5",
     "screenshots": []
 }
diff --git a/services/DriverService.php b/services/DriverService.php
@@ -75,6 +75,10 @@ public function getMobileAppDriver(): ?DriverInterface
         return $this->getConfiguredDriverByType(Proxy::class);
     }
 
+    public function hasConfiguredWebDriver(): bool
+    {
+        return ($this->getWebDriver() !== null);
+    }
 
     public function hasConfiguredDriver(): bool
     {