Merge pull request #12513 from MrPetovan/bug/12507-rel-meeee

[friendica.git] / src / Content / Conversation.php

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index aa7c016180493f5e77d78a147aa18452893fde72..d9036c78399c99be8fdd77a94a2fd4ee4f4c4c70 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -985,8 +985,8 @@ class Conversation
 
                $thread_items = Post::selectForUser($uid, array_merge(ItemModel::DISPLAY_FIELDLIST, ['featured', 'contact-uid', 'gravity', 'post-type', 'post-reason']), $condition, $params);
 
-               $items       = [];
-               $quoteuriids = [];
+               $items         = [];
+               $quote_uri_ids = [];
 
                while ($row = Post::fetch($thread_items)) {
                        if (!empty($items[$row['uri-id']]) && ($row['uid'] == 0)) {
@@ -1007,7 +1007,7 @@ class Conversation
                        }
 
                        if (in_array($row['gravity'], [ItemModel::GRAVITY_PARENT, ItemModel::GRAVITY_COMMENT])) {
-                               $quoteuriids[$row['uri-id']] = [
+                               $quote_uri_ids[$row['uri-id']] = [
                                        'uri-id'        => $row['uri-id'],
                                        'uri'           => $row['uri'],
                                        'parent-uri-id' => $row['parent-uri-id'],
@@ -1020,7 +1020,7 @@ class Conversation
 
                DBA::close($thread_items);
 
-               $quotes = Post::select(array_merge(ItemModel::DISPLAY_FIELDLIST, ['featured', 'contact-uid', 'gravity', 'post-type', 'post-reason']), ['quote-uri-id' => array_column($quoteuriids, 'uri-id'), 'body' => '', 'uid' => 0]);
+               $quotes = Post::select(array_merge(ItemModel::DISPLAY_FIELDLIST, ['featured', 'contact-uid', 'gravity', 'post-type', 'post-reason']), ['quote-uri-id' => array_column($quote_uri_ids, 'uri-id'), 'body' => '', 'uid' => 0]);
                while ($quote = Post::fetch($quotes)) {
                        $row = $quote;
 
@@ -1028,10 +1028,10 @@ class Conversation
                        $row['verb']          = $row['body'] = $row['raw-body'] = Activity::ANNOUNCE;
                        $row['gravity']       = ItemModel::GRAVITY_ACTIVITY;
                        $row['object-type']   = Activity\ObjectType::NOTE;
-                       $row['parent-uri']    = $quoteuriids[$quote['quote-uri-id']]['parent-uri'];
-                       $row['parent-uri-id'] = $quoteuriids[$quote['quote-uri-id']]['parent-uri-id'];
-                       $row['thr-parent']    = $quoteuriids[$quote['quote-uri-id']]['uri'];
-                       $row['thr-parent-id'] = $quoteuriids[$quote['quote-uri-id']]['uri-id'];
+                       $row['parent-uri']    = $quote_uri_ids[$quote['quote-uri-id']]['parent-uri'];
+                       $row['parent-uri-id'] = $quote_uri_ids[$quote['quote-uri-id']]['parent-uri-id'];
+                       $row['thr-parent']    = $quote_uri_ids[$quote['quote-uri-id']]['uri'];
+                       $row['thr-parent-id'] = $quote_uri_ids[$quote['quote-uri-id']]['uri-id'];
 
                        $items[$row['uri-id']] = $this->addRowInformation($row, [], []);
                }