diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-03 19:18:55 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-03 19:18:55 -0700 |
| commit | f51a7225c877870f01829c2284fec1ab27ffbee2 (patch) | |
| tree | 026b4eb97df9dfa0516c46c72e9b70d19e32529c /Zotlabs/Module/Ping.php | |
| parent | 9abb061e7185a29cb85ebbad04deba715e1a6a06 (diff) | |
| parent | a899ce1c22386b9ff882048cba35d46f560ee654 (diff) | |
| download | volse-hubzilla-f51a7225c877870f01829c2284fec1ab27ffbee2.tar.gz volse-hubzilla-f51a7225c877870f01829c2284fec1ab27ffbee2.tar.bz2 volse-hubzilla-f51a7225c877870f01829c2284fec1ab27ffbee2.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Ping.php')
| -rw-r--r-- | Zotlabs/Module/Ping.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index c91659f2f..5e2d04c1f 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -169,15 +169,13 @@ class Ping extends \Zotlabs\Web\Controller { $r = q("SELECT * FROM item WHERE uid = %d AND author_xchan != '%s' - AND obj_type != '%s' AND item_unseen = 1 AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "' $item_normal ORDER BY created DESC LIMIT 300", intval($sys['channel_id']), - dbesc(get_observer_hash()), - dbesc(ACTIVITY_OBJ_FILE) + dbesc(get_observer_hash()) ); if($r) { @@ -313,11 +311,9 @@ class Ping extends \Zotlabs\Web\Controller { $r = q("SELECT * FROM item WHERE item_unseen = 1 and uid = %d $item_normal AND author_xchan != '%s' - AND obj_type != '%s' ORDER BY created DESC limit 300", intval(local_channel()), - dbesc($ob_hash), - dbesc(ACTIVITY_OBJ_FILE) + dbesc($ob_hash) ); if($r) { @@ -487,11 +483,9 @@ class Ping extends \Zotlabs\Web\Controller { $r = q("SELECT id, item_wall FROM item WHERE item_unseen = 1 and uid = %d $item_normal - AND author_xchan != '%s' - AND obj_type != '%s'", + AND author_xchan != '%s'", intval(local_channel()), - dbesc($ob_hash), - dbesc(ACTIVITY_OBJ_FILE) + dbesc($ob_hash) ); if($r) { |