Fix issue where null values are present in the event results

wintercms · Feb 3, 2024 · 9c1798b · 9c1798b
1 parent ef05e34
commit 9c1798b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/models/User.php b/models/User.php
@@ -519,9 +519,15 @@ public function getNotificationVars()
         /*
          * Extensibility
          */
-        $result = Event::fire('winter.user.getNotificationVars', [$this]);
-        if ($result && is_array($result)) {
-            $vars = call_user_func_array('array_merge', $result) + $vars;
+        $results = Event::fire('winter.user.getNotificationVars', [$this]);
+        if ($results && is_array($results)) {
+            $tempResults = [];
+            foreach ($results as $result) {
+                if ($result && is_array($result)) {
+                    $tempResults = array_merge($tempResults, $result);
+                }
+            }
+            $vars = $tempResults + $vars;
         }
 
         return $vars;