diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-20 15:04:08 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-20 15:04:08 -0800 |
| commit | babe14410c92b2ae6985aebf69d0e755c0fc2045 (patch) | |
| tree | 6ec1053cf706b82c44438982ead9ae360939fd83 /Zotlabs/Module | |
| parent | 4cd0b745cbc24a035a5e9ba488917ec7beeda888 (diff) | |
| parent | 250d758d74fa1e117ed11c884a0c26040e696494 (diff) | |
| download | volse-hubzilla-babe14410c92b2ae6985aebf69d0e755c0fc2045.tar.gz volse-hubzilla-babe14410c92b2ae6985aebf69d0e755c0fc2045.tar.bz2 volse-hubzilla-babe14410c92b2ae6985aebf69d0e755c0fc2045.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Hq.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Ping.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 41e9d40ca..92dfc8587 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -48,7 +48,7 @@ class Hq extends \Zotlabs\Web\Controller { WHERE uid = %d AND mid = parent_mid $item_normal - ORDER BY id DESC + ORDER BY created DESC limit 1", local_channel() ); diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 8644b8326..406e554d1 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -492,10 +492,11 @@ class Ping extends \Zotlabs\Web\Controller { $t3 = dba_timer(); if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) { + $r = q("SELECT id, item_wall FROM item WHERE item_unseen = 1 and uid = %d $item_normal - AND author_xchan != '%s'", + AND author_xchan != '%s' $sql_extra ", intval(local_channel()), dbesc($ob_hash) ); |