mirror of
https://github.com/friendica/friendica
synced 2024-12-23 04:40:15 +00:00
Account for null value in Entity\Notify->msg
- Update possible types of entity properties
This commit is contained in:
parent
9e13ef4021
commit
fff1d44878
2 changed files with 6 additions and 6 deletions
|
@ -61,15 +61,15 @@ class Notify extends BaseEntity
|
|||
protected $photo;
|
||||
/** @var DateTime */
|
||||
protected $date;
|
||||
/** @var string */
|
||||
/** @var string|null */
|
||||
protected $msg;
|
||||
/** @var int */
|
||||
protected $uid;
|
||||
/** @var UriInterface */
|
||||
protected $link;
|
||||
/** @var int */
|
||||
/** @var int|null */
|
||||
protected $itemId;
|
||||
/** @var int */
|
||||
/** @var int|null */
|
||||
protected $parent;
|
||||
/** @var bool */
|
||||
protected $seen;
|
||||
|
@ -79,13 +79,13 @@ class Notify extends BaseEntity
|
|||
protected $otype;
|
||||
/** @var string */
|
||||
protected $name_cache;
|
||||
/** @var string */
|
||||
/** @var string|null */
|
||||
protected $msg_cache;
|
||||
/** @var int|null */
|
||||
protected $uriId;
|
||||
/** @var int|null */
|
||||
protected $parentUriId;
|
||||
/** @var int */
|
||||
/** @var int|null */
|
||||
protected $id;
|
||||
|
||||
public function __construct(int $type, string $name, UriInterface $url, UriInterface $photo, DateTime $date, int $uid, UriInterface $link, bool $seen, string $verb, string $otype, string $name_cache, string $msg = null, string $msg_cache = null, int $itemId = null, int $uriId = null, int $parent = null, ?int $parentUriId = null, ?int $id = null)
|
||||
|
|
|
@ -222,7 +222,7 @@ class FormattedNotify extends BaseFactory
|
|||
$this->baseUrl . '/notify/' . $Notify->id,
|
||||
Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO),
|
||||
$Notify->url,
|
||||
strip_tags(BBCode::toPlaintext($Notify->msg)),
|
||||
strip_tags(BBCode::toPlaintext($Notify->msg ?? '')),
|
||||
DateTimeFormat::local($Notify->date->format(DateTimeFormat::MYSQL), 'r'),
|
||||
Temporal::getRelativeDate($Notify->date->format(DateTimeFormat::MYSQL)),
|
||||
$Notify->seen
|
||||
|
|
Loading…
Reference in a new issue