aboutsummaryrefslogtreecommitdiffstats
path: root/include/notifier.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-12-19 19:54:18 +0000
committerThomas Willingham <founder@kakste.com>2012-12-19 19:54:18 +0000
commita2b30f9411f537d9eb15d697970d682869c76a0e (patch)
treeb96702d7ece5d564aaf00cdd950270b0b67ac3e6 /include/notifier.php
parent2cfd1a3f085e44d4513fd969bb01be74a59d5784 (diff)
parent44e70bdca367344c441b1e26e790ac0465953734 (diff)
downloadvolse-hubzilla-a2b30f9411f537d9eb15d697970d682869c76a0e.tar.gz
volse-hubzilla-a2b30f9411f537d9eb15d697970d682869c76a0e.tar.bz2
volse-hubzilla-a2b30f9411f537d9eb15d697970d682869c76a0e.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/tpl/nav.tpl
Diffstat (limited to 'include/notifier.php')
-rw-r--r--include/notifier.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/notifier.php b/include/notifier.php
index c95caf942..71571cbd5 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -143,13 +143,13 @@ function notifier_run($argv, $argc){
$item = $message[0];
$encoded_item = encode_mail($item);
-dbg(1);
+
$s = q("select * from channel where channel_id = %d limit 1",
intval($item['channel_id'])
);
if($s)
$channel = $s[0];
-dbg(0);
+
}
elseif($cmd === 'expire') {
$normal_mode = false;