aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-25 22:51:45 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-25 22:51:45 -0700
commit9f81c3345b40d635a34f0448dd625b17f20508c3 (patch)
tree6f284d707b8d05fd6c16baf6c1a69aea7f8dfcc6 /include
parent52a2c7eb46ea3b9509e48f29eca6f1c398a85538 (diff)
downloadvolse-hubzilla-9f81c3345b40d635a34f0448dd625b17f20508c3.tar.gz
volse-hubzilla-9f81c3345b40d635a34f0448dd625b17f20508c3.tar.bz2
volse-hubzilla-9f81c3345b40d635a34f0448dd625b17f20508c3.zip
fixup of some nits with live update and remote comment display on profile page
Diffstat (limited to 'include')
-rw-r--r--include/items.php2
-rw-r--r--include/notifier.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index bcfa70763..2cb894f5a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -63,7 +63,7 @@ function get_feed_for(&$a,$dfrn_id,$owner_id,$last_update) {
`contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- AND `item`.`type` != 'remote' AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `item`.`edited` > '%s'
$sql_extra
ORDER BY `parent` ASC, `created` ASC LIMIT 0, 300",
diff --git a/include/notifier.php b/include/notifier.php
index bd787dbfb..d8e066583 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -15,7 +15,7 @@ require_once("datetime.php");
if($argc < 3)
exit;
-dbg(3);
+//dbg(3);
$baseurl = $argv[1];
$a->set_baseurl($argv[1]);