harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync item_search with yesterday's network fix for collections. Add ud_addr to update table to store the target address since it's possible the mirroring directory won't yet have an xchan or hubloc they can link the ud_hash to and therefore mayn't know how to contact them.

Browse Source
This commit is contained in:
friendica
2013-09-19 01:01:51 -07:00
parent 14f6bf06e7
commit 63fc92b9e5
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/items.php
View File

@@ -3645,16 +3645,22 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
return $result;
}
$contacts = expand_groups(array($arr['group']));
if((is_array($contacts)) && count($contacts)) {
$contact_str = implode(',',$contacts);
$contact_str = '';
$contacts = group_get_members($group);
if($contacts) {
foreach($contacts as $c) {
if($contact_str)
$contact_str .= ',';
$contact_str .= "'" . $c['xchan'] . "'";
}
}
else {
$contact_str = ' 0 ';
$result['message'] = t('Collection has no members.');
$contact_str = ' 0 ';
info( t('Group is empty'));
}
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND ( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and item_restrict = 0 ) ";
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str)) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and item_restrict = 0 ) ";
}
elseif($arr['cid'] && $uid) {