fix bug with has events

laravel · Feb 27, 2017 · c5a6290 · c5a6290
1 parent 063e5ae
commit c5a6290
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php b/src/Illuminate/Database/Eloquent/Concerns/HasEvents.php
@@ -138,7 +138,11 @@ protected function fireModelEvent($event, $halt = true)
 
         $result = $this->fireCustomModelEvent($event, $method);
 
-        return ! is_null($result) ? $result : static::$dispatcher->{$method}(
+        if ($result === false) {
+            return false;
+        }
+
+        return ! empty($result) ? $result : static::$dispatcher->{$method}(
             "eloquent.{$event}: ".static::class, $this
         );
     }