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

make collections work again

Browse Source
This commit is contained in:
friendica 2013-09-18 04:06:44 -07:00
parent b0a4f1b30a
commit 9d49f2a47b
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mod/network.php
View File

@ -432,16 +432,21 @@ function network_content(&$a, $update = 0, $load = false) {
// NOTREACHED // NOTREACHED
} }
$contacts = expand_groups(array($arr['group'])); $contact_str = '';
if((is_array($contacts)) && count($contacts)) { $contacts = group_get_members($group);
$contact_str = implode(',',$contacts); if($contacts) {
foreach($contacts as $c) {
if($contact_str)
$contact_str .= ',';
$contact_str .= "'" . $c['xchan'] . "'";
}
} }
else { else {
$contact_str = ' 0 '; $contact_str = ' 0 ';
info( t('Group is empty')); 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 ) ";
} }

2
version.inc
View File

@ -1 +1 @@
2013-09-17.439 2013-09-18.440