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

Remove duplicate fields in Model\Event::getItemArrayForId 

- Fix formatting in Model\Event
This commit is contained in:
Hypolite Petovan 2023-07-25 22:47:27 +02:00
parent 592e829347
commit 7e8a44c15b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Model/Event.php
View File

@ -344,7 +344,6 @@ class Event
$event['id'] = $event_id; $event['id'] = $event_id;
$item['uid'] = $event['uid']; $item['uid'] = $event['uid'];
$item['contact-id'] = $event['cid'];
$item['uri'] = $event['uri']; $item['uri'] = $event['uri'];
$item['uri-id'] = ItemURI::getIdByURI($event['uri']); $item['uri-id'] = ItemURI::getIdByURI($event['uri']);
$item['guid'] = $event['guid']; $item['guid'] = $event['guid'];
@ -367,7 +366,6 @@ class Event
$item['visible'] = 1; $item['visible'] = 1;
$item['verb'] = Activity::POST; $item['verb'] = Activity::POST;
$item['object-type'] = Activity\ObjectType::EVENT; $item['object-type'] = Activity\ObjectType::EVENT;
$item['post-type'] = Item::PT_EVENT;
$item['origin'] = $event['cid'] === 0 ? 1 : 0; $item['origin'] = $event['cid'] === 0 ? 1 : 0;
$item['body'] = self::getBBCode($event); $item['body'] = self::getBBCode($event);
$item['event-id'] = $event['id']; $item['event-id'] = $event['id'];
@ -547,8 +545,8 @@ class Event
// Query for the event by event id // Query for the event by event id
$events = DBA::toArray(DBA::p( $events = DBA::toArray(DBA::p(
"SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event` "SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event`
LEFT JOIN `post-user` LEFT JOIN `post-user`
ON `post-user`.`event-id` = `event`.`id` ON `post-user`.`event-id` = `event`.`id`
AND `post-user`.`uid` = `event`.`uid` AND `post-user`.`uid` = `event`.`uid`
WHERE `event`.`id` = ? WHERE `event`.`id` = ?
AND `event`.`uid` = ? AND `event`.`uid` = ?
@ -932,9 +930,9 @@ class Event
// Construct the profile link (magic-auth). // Construct the profile link (magic-auth).
$author = [ $author = [
'uid' => 0, 'uid' => 0,
'id' => $item['author-id'], 'id' => $item['author-id'],
'network' => $item['author-network'], 'network' => $item['author-network'],
'url' => $item['author-link'], 'url' => $item['author-link'],
'alias' => $item['author-alias'] 'alias' => $item['author-alias']
]; ];