diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 6 | ||||
| -rw-r--r-- | include/socgraph.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 7f96bfb4b..4e85bef37 100755 --- a/include/items.php +++ b/include/items.php @@ -4408,7 +4408,7 @@ function zot_feed($uid,$observer_xchan,$arr) { $limit = " LIMIT 100 "; if($mindate != NULL_DATE) { - $sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) "; + $sql_extra .= " and ( created > '$mindate' or changed > '$mindate' ) "; } if($message_id) { @@ -4426,7 +4426,7 @@ function zot_feed($uid,$observer_xchan,$arr) { if(is_sys_channel($uid)) { require_once('include/security.php'); - $r = q("SELECT parent, created from item + $r = q("SELECT parent, created, postopts from item WHERE uid != %d AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ") AND (item_flags & %d) > 0 @@ -4436,7 +4436,7 @@ function zot_feed($uid,$observer_xchan,$arr) { ); } else { - $r = q("SELECT parent, created from item + $r = q("SELECT parent, created, postopts from item WHERE uid = %d AND item_restrict = 0 AND (item_flags & %d) > 0 $sql_extra GROUP BY parent ORDER BY created ASC $limit", diff --git a/include/socgraph.php b/include/socgraph.php index acebec419..0ad7c4034 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -470,7 +470,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 . |