X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/7f5872372d0228f6ad6604cb433935b41c9ae94a..refs/pull/261/head:/app/Activity.php diff --git a/app/Activity.php b/app/Activity.php index a1fe608f0..af386700a 100644 --- a/app/Activity.php +++ b/app/Activity.php @@ -2,8 +2,6 @@ namespace BookStack; -use Illuminate\Database\Eloquent\Model; - /** * @property string key * @property \User user @@ -15,10 +13,10 @@ class Activity extends Model /** * Get the entity for this activity. - * @return bool */ public function entity() { + if ($this->entity_type === '') $this->entity_type = null; return $this->morphTo('entity'); } @@ -28,7 +26,7 @@ class Activity extends Model */ public function user() { - return $this->belongsTo('BookStack\User'); + return $this->belongsTo(User::class); } /** @@ -46,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]; } }