From 20528a2442b7149ad8fd1f4cb470062d9ff73b31 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 20 Apr 2021 21:03:44 +0100
Subject: [PATCH] Fixed error thrown when owner existed but the creator did not

Added test to cover.
For #2687
---
 resources/views/partials/entity-meta.blade.php |  2 +-
 tests/Entity/PageTest.php                      | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/resources/views/partials/entity-meta.blade.php b/resources/views/partials/entity-meta.blade.php
index 8996df9bb..298cc7c3e 100644
--- a/resources/views/partials/entity-meta.blade.php
+++ b/resources/views/partials/entity-meta.blade.php
@@ -14,7 +14,7 @@
         </div>
     @endif
 
-    @if ($entity->ownedBy && $entity->ownedBy->id !== $entity->createdBy->id)
+    @if ($entity->ownedBy && $entity->owned_by !== $entity->created_by)
         <div>
             @icon('user'){!! trans('entities.meta_owned_name', [
             'user' => "<a href='{$entity->ownedBy->getProfileUrl()}'>".e($entity->ownedBy->name). "</a>"
diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index 4fc6b9c16..615bae21e 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -6,6 +6,22 @@ use Tests\TestCase;
 
 class PageTest extends TestCase
 {
+
+    public function test_page_view_when_creator_is_deleted_but_owner_exists()
+    {
+        $page = Page::query()->first();
+        $user = $this->getViewer();
+        $owner = $this->getEditor();
+        $page->created_by = $user->id;
+        $page->owned_by = $owner->id;
+        $page->save();
+        $user->delete();
+
+        $resp = $this->asAdmin()->get($page->getUrl());
+        $resp->assertStatus(200);
+        $resp->assertSeeText('Owned by ' . $owner->name);
+    }
+
     public function test_page_creation_with_markdown_content()
     {
         $this->setSettings(['app-editor' => 'markdown']);