aboutsummaryrefslogtreecommitdiffstats
path: root/include/notifier.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-09 18:47:52 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-09 18:47:52 +0100
commit41057ac3642ea8c7126cc980be5d896b8b6ff7c3 (patch)
tree4ab491a65da69c4deb81693f899b9550f5bee010 /include/notifier.php
parentbfe8e1e2e945c49fc1dd9e65279c32ce3be8ff14 (diff)
parent1c982315dd2d1886432eaece7c7ccb8d385640ae (diff)
downloadvolse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.tar.gz
volse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.tar.bz2
volse-hubzilla-41057ac3642ea8c7126cc980be5d896b8b6ff7c3.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/notifier.php')
-rw-r--r--include/notifier.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/notifier.php b/include/notifier.php
index 32d702cb5..5260e629f 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -578,7 +578,7 @@ function notifier_run($argv, $argc){
));
// only create delivery reports for normal undeleted items
- if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted'])) {
+ if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) {
q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s','%s','%s','%s','%s','%s','%s' ) ",
dbesc($target_item['mid']),
dbesc($hub['hubloc_host']),