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

zotfeed issues

Browse Source
This commit is contained in:
friendica 2015-04-24 15:01:37 -07:00
parent 98b3d7d6ff
commit 268307b534
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/items.php
View File

@ -4408,7 +4408,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
$limit = " LIMIT 100 "; $limit = " LIMIT 100 ";
if($mindate != NULL_DATE) { if($mindate != NULL_DATE) {
$sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) "; $sql_extra .= " and ( created > '$mindate' or changed > '$mindate' ) ";
} }
if($message_id) { if($message_id) {
@ -4426,7 +4426,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
if(is_sys_channel($uid)) { if(is_sys_channel($uid)) {
require_once('include/security.php'); require_once('include/security.php');
$r = q("SELECT parent, created from item $r = q("SELECT parent, created, postopts from item
WHERE uid != %d WHERE uid != %d
AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ") AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ")
AND (item_flags & %d) > 0 AND (item_flags & %d) > 0
@ -4436,7 +4436,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
); );
} }
else { else {
$r = q("SELECT parent, created from item $r = q("SELECT parent, created, postopts from item
WHERE uid = %d AND item_restrict = 0 WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d) > 0 AND (item_flags & %d) > 0
$sql_extra GROUP BY parent ORDER BY created ASC $limit", $sql_extra GROUP BY parent ORDER BY created ASC $limit",