aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/conversation.php10
-rw-r--r--include/text.php10
-rw-r--r--mod/network.php4
3 files changed, 12 insertions, 12 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 17792e09a..b0a388a68 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1230,19 +1230,11 @@ function add_children_to_list($children, &$arr) {
}
}
-function conv_sort($arr,$order,$uid = 0) {
+function conv_sort($arr,$order) {
if((!(is_array($arr) && count($arr))))
return array();
- if($uid) {
- for($x = 0; $x < count($arr); $x ++) {
- $arr[$x]['real_uid'] = $arr[$x]['uid'];
- $arr[$x]['uid'] = $uid;
- }
- }
-
-
$parents = array();
$children = array();
diff --git a/include/text.php b/include/text.php
index 599c5d445..573af4d32 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1851,9 +1851,17 @@ function ids_to_querystr($arr,$idx = 'id') {
// author_xchan and owner_xchan. If $abook is true also include the abook info.
// This is needed in the API to save extra per item lookups there.
-function xchan_query(&$items,$abook = true) {
+function xchan_query(&$items,$abook = true,$effective_uid = 0) {
$arr = array();
if($items && count($items)) {
+
+ if($effective_uid) {
+ for($x = 0; $x < count($items); $x ++) {
+ $items[$x]['real_uid'] = $items[$x]['uid'];
+ $items[$x]['uid'] = $effective_uid;
+ }
+ }
+
foreach($items as $item) {
if($item['owner_xchan'] && (! in_array($item['owner_xchan'],$arr)))
$arr[] = "'" . dbesc($item['owner_xchan']) . "'";
diff --git a/mod/network.php b/mod/network.php
index 2b07bb139..0bad366d4 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -403,9 +403,9 @@ function network_content(&$a, $update = 0, $load = false) {
dbesc($parents_str)
);
- xchan_query($items);
+ xchan_query($items,true,(($firehose) ? local_user() : 0));
$items = fetch_post_tags($items,true);
- $items = conv_sort($items,$ordering,(($firehose) ? local_user() : 0));
+ $items = conv_sort($items,$ordering);
}
else {
$items = array();