From 49301c1722f7b88ff0020072be31be6844078978 Mon Sep 17 00:00:00 2001 From: trendschau Date: Thu, 25 Jan 2024 15:05:13 +0100 Subject: [PATCH] V2.1.2 Fix fullname in user model and logic to add author in meta --- system/typemill/Models/Meta.php | 12 ++++++++++-- system/typemill/Models/User.php | 12 +++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/system/typemill/Models/Meta.php b/system/typemill/Models/Meta.php index 5ab0659..c4f0eec 100644 --- a/system/typemill/Models/Meta.php +++ b/system/typemill/Models/Meta.php @@ -78,7 +78,11 @@ class Meta $user = new User(); if($user->setUser($username)) { - $author = $user->getFullName(); + $fullname = $user->getFullName(); + if($fullname) + { + $author = $fullname; + } } $meta = []; @@ -127,7 +131,11 @@ class Meta $user = new User(); if($user->setUser($currentuser)) { - $author = $user->getFullName(); + $fullname = $user->getFullName(); + if($fullname) + { + $author = $fullname; + } } } diff --git a/system/typemill/Models/User.php b/system/typemill/Models/User.php index 6a60042..718d0f0 100644 --- a/system/typemill/Models/User.php +++ b/system/typemill/Models/User.php @@ -71,7 +71,17 @@ class User public function getFullName() { - return trim($this->user['firstname'] . ' ' . $this->user['lastname']); + + $firstname = $this->user['firstname'] ?? ''; + $lastname = $this->user['lastname'] ?? ''; + $fullname = trim($firstname . ' ' . $lastname); + + if($fullname != '') + { + return $fullname; + } + + return false; } public function getError()