Bugfix - `item_id`

diff --git a/mod/photos.php b/mod/photos.php
index b18c06e2a3a4e5bf4b410f47b1a83f3c910b1245..0524845b155e99d844c216ebc7637d3b94246c21 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1504,7 +1504,7 @@ function photos_content(App $a)
                                                '$title' => $title_e,
                                                '$body' => $body_e,
                                                '$ago' => Temporal::getRelativeDate($item['created']),
-                                               '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+                                               '$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''),
                                                '$drop' => $drop,
                                                '$comment' => $comment
                                        ]);
@@ -1513,7 +1513,7 @@ function photos_content(App $a)
                                                $comments .= Renderer::replaceMacros($cmnt_tpl, [
                                                        '$return_path' => '',
                                                        '$jsreload' => $return_path,
-                                                       '$id' => $item['item_id'],
+                                                       '$id' => $item['id'],
                                                        '$parent' => $item['parent'],
                                                        '$profile_uid' =>  $owner_uid,
                                                        '$mylink' => $contact['url'],

diff --git a/src/Model/Item.php b/src/Model/Item.php
index bd9cca0c926ae64909be053b6dc2c2a4464e4994..cf4f3805af29a64d43a19857711132b306ed0180 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -82,12 +82,12 @@ class Item extends BaseObject
                        'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
                        'created', 'edited', 'commented', 'received', 'changed', 'verb',
                        'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
-                       'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id', 'post-type',
+                       'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
                        'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
                        'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'network',
                        'title', 'content-warning', 'body', 'location', 'coord', 'app',
                        'rendered-hash', 'rendered-html', 'object-type', 'object', 'target-type', 'target',
-                       'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
+                       'author-id', 'author-link', 'author-name', 'author-avatar',
                        'owner-id', 'owner-link', 'owner-name', 'owner-avatar'];
 
        // Never reorder or remove entries from this list. Just add new ones at the end, if needed.