X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/4ddbc9556bf02ecd31aff093ed4acb200c9fcfd6..refs/pull/3391/head:/app/Entities/Models/PageRevision.php diff --git a/app/Entities/Models/PageRevision.php b/app/Entities/Models/PageRevision.php index a3c4379a6..800e5e7f2 100644 --- a/app/Entities/Models/PageRevision.php +++ b/app/Entities/Models/PageRevision.php @@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * Class PageRevision. * + * @property mixed $id * @property int $page_id * @property string $slug * @property string $book_slug @@ -27,6 +28,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class PageRevision extends Model { protected $fillable = ['name', 'html', 'text', 'markdown', 'summary']; + protected $hidden = ['html', 'markdown', 'restricted', 'text']; /** * Get the user that created the page revision. @@ -46,27 +48,16 @@ class PageRevision extends Model /** * Get the url for this revision. - * - * @param null|string $path - * - * @return string */ - public function getUrl($path = null) + public function getUrl(string $path = ''): string { - $url = $this->page->getUrl() . '/revisions/' . $this->id; - if ($path) { - return $url . '/' . trim($path, '/'); - } - - return $url; + return $this->page->getUrl('/revisions/' . $this->id . '/' . ltrim($path, '/')); } /** * Get the previous revision for the same page if existing. - * - * @return \BookStack\Entities\PageRevision|null */ - public function getPrevious() + public function getPrevious(): ?PageRevision { $id = static::newQuery()->where('page_id', '=', $this->page_id) ->where('id', '<', $this->id)