Merge remote-tracking branch 'mike/master' into dev

This commit is contained in:
Mario Vavti
2017-11-20 14:27:20 +01:00
11 changed files with 169 additions and 64 deletions

View File

@@ -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)
);