diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-24 15:01:37 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-24 15:01:37 -0700 |
| commit | 268307b5346674159ef8f6d3fbfadaf41a7443f0 (patch) | |
| tree | 70859c082b141275e4a344650b9af7ae7f5a71ea | |
| parent | 98b3d7d6fffe582387c9ea59166d571965fad468 (diff) | |
| download | volse-hubzilla-268307b5346674159ef8f6d3fbfadaf41a7443f0.tar.gz volse-hubzilla-268307b5346674159ef8f6d3fbfadaf41a7443f0.tar.bz2 volse-hubzilla-268307b5346674159ef8f6d3fbfadaf41a7443f0.zip | |
zotfeed issues
| -rwxr-xr-x | include/items.php | 6 |
1 files changed, 3 insertions, 3 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", |