diff options
author | zotlabs <mike@macgirvin.com> | 2017-08-01 18:20:34 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-08-01 18:20:34 -0700 |
commit | 6e9fb9b9fdef11209a3ee1a85d5ba1d02659e209 (patch) | |
tree | ff58412b458a0b03325dc851707fe1e7e31323c6 /Zotlabs/Module | |
parent | a97b09210e977d52a5bda1dee2b1eddc19afc013 (diff) | |
parent | 6614d465d6b90286f2d4e9546d9adb8bcb02dec1 (diff) | |
download | volse-hubzilla-6e9fb9b9fdef11209a3ee1a85d5ba1d02659e209.tar.gz volse-hubzilla-6e9fb9b9fdef11209a3ee1a85d5ba1d02659e209.tar.bz2 volse-hubzilla-6e9fb9b9fdef11209a3ee1a85d5ba1d02659e209.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r-- | Zotlabs/Module/Ping.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 190208727..f38ed510e 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -147,11 +147,13 @@ class Ping extends \Zotlabs\Web\Controller { $pubs = q("SELECT count(id) as total 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", intval($sys['channel_id']), - dbesc(get_observer_hash()) + dbesc(get_observer_hash()), + dbesc(ACTIVITY_OBJ_FILE) ); if($pubs) |