Browse Source

Move unicity check after array initilization in builtin_activity_puller()

- Address https://github.com/friendica/friendica/pull/9569#issuecomment-731613088
- Address https://github.com/friendica/friendica/issues/9251#issuecomment-731615844
pull/9571/head
Hypolite Petovan 5 days ago
parent
commit
a16d46b0d7
1 changed files with 3 additions and 5 deletions
  1. +3
    -5
      include/conversation.php

+ 3
- 5
include/conversation.php View File

@@ -1034,11 +1034,6 @@ function builtin_activity_puller(array $activity, array &$conv_responses)
$activity['thr-parent'] = $activity['parent-uri'];
}

// only list each unique author once
if (in_array($link, $conv_responses[$mode][$activity['thr-parent']]['links'])) {
continue;
}

// Skip when the causer of the parent is the same than the author of the announce
if (($verb == Activity::ANNOUNCE) && Item::exists(['uri' => $activity['thr-parent'],
'uid' => $activity['uid'], 'causer-id' => $activity['author-id'], 'gravity' => GRAVITY_PARENT])) {
@@ -1050,6 +1045,9 @@ function builtin_activity_puller(array $activity, array &$conv_responses)
'links' => [],
'self' => 0,
];
} elseif (in_array($link, $conv_responses[$mode][$activity['thr-parent']]['links'])) {
// only list each unique author once
continue;
}

if (public_contact() == $activity['author-id']) {


Loading…
Cancel
Save