Add Carbon localization support

[bookstack] / app / Activity.php

diff --git a/app/Activity.php b/app/Activity.php
index bbbe5e89311ae6d37b21a3197a2a5b1d02f1fc0c..af386700afe2ab3d7081d12018bff8acca5c3bc0 100644 (file)
--- a/app/Activity.php
+++ b/app/Activity.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Oxbow;
-
-use Illuminate\Database\Eloquent\Model;
+namespace BookStack;
 
 /**
  * @property string  key
@@ -15,15 +13,11 @@ class Activity extends Model
 
     /**
      * Get the entity for this activity.
-     * @return bool
      */
     public function entity()
     {
-        if ($this->entity_id) {
-            return $this->morphTo('entity')->first();
-        } else {
-            return false;
-        }
+        if ($this->entity_type === '') $this->entity_type = null;
+        return $this->morphTo('entity');
     }
 
     /**
@@ -32,7 +26,7 @@ class Activity extends Model
      */
     public function user()
     {
-        return $this->belongsTo('Oxbow\User');
+        return $this->belongsTo(User::class);
     }
 
     /**
@@ -50,7 +44,7 @@ class Activity extends Model
      * @return bool
      */
     public function isSimilarTo($activityB) {
-        return [$this->key, $this->entitiy_type, $this->entitiy_id] === [$activityB->key, $activityB->entitiy_type, $activityB->entitiy_id];
+        return [$this->key, $this->entity_type, $this->entity_id] === [$activityB->key, $activityB->entity_type, $activityB->entity_id];
     }
 
 }