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

Merge branch 'master' into tres

Browse Source 
Conflicts:
	include/notifier.php
This commit is contained in:
friendica
2015-04-29 21:49:43 -07:00
parent 6679734135 2376d2140a
commit c4221f3273
26 changed files with 1229 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/socgraph.php
View File

@@ -466,7 +466,7 @@ function poco($a,$extended = false) {
$sql_extra = " and abook_flags = 0 ";
if($cid)
$sql_extra = sprintf(" and abook_id = %d ",intval($cid));
$sql_extra = sprintf(" and abook_id = %d and ( abook_flags & " . ABOOK_FLAG_HIDDEN . " ) = 0 ",intval($cid));
if($system_mode) {
$r = q("SELECT count(*) as `total` from abook where ( abook_flags & " . ABOOK_FLAG_SELF .