clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix foreign key violation for Notify insert with uri_id/parent_uri_id 0 instead NULL

This commit is contained in:
Philipp 2021-10-21 22:11:15 +02:00
parent bf7c66b2c7
commit e1574dc2e7
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Navigation/Notifications/Depository/Notify.php
View File

@ -485,9 +485,9 @@ class Notify extends BaseDepository
private function storeAndSend($params, $sitelink, $tsitelink, $hsitelink, $title, $subject, $preamble, $epreamble, $body, $itemlink, $show_in_notification_page)
{
$item_id = $params['item']['id'] ?? 0;
$uri_id = $params['item']['uri-id'] ?? 0;
$uri_id = $params['item']['uri-id'] ?? null;
$parent_id = $params['item']['parent'] ?? 0;
$parent_uri_id = $params['item']['parent-uri-id'] ?? 0;
$parent_uri_id = $params['item']['parent-uri-id'] ?? null;
// Ensure that the important fields are set at any time
$fields = ['nickname'];

6
src/Navigation/Notifications/Entity/Notify.php
View File

@ -60,14 +60,14 @@ class Notify extends BaseEntity
protected $name_cache;
/** @var string */
protected $msg_cache;
/** @var int */
/** @var int|null */
protected $uriId;
/** @var int */
/** @var int|null */
protected $parentUriId;
/** @var int */
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)
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)
{
$this->type = $type;
$this->name = $name;