aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-05 00:03:30 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-05 00:03:30 -0400
commit9c4fca446bdff87d7858fdbf52bb2bed7fb70960 (patch)
tree0db8748c1bd090895906bd5d141c6f8da78bb849 /include
parent9860d6b95ce1ac3d1ed6e4256df5874d06b9e2ea (diff)
parent37801dd6ed60776fc128d44f0d63a57e1b5e37d0 (diff)
downloadvolse-hubzilla-9c4fca446bdff87d7858fdbf52bb2bed7fb70960.tar.gz
volse-hubzilla-9c4fca446bdff87d7858fdbf52bb2bed7fb70960.tar.bz2
volse-hubzilla-9c4fca446bdff87d7858fdbf52bb2bed7fb70960.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: also block outbound let's catch d* disabled at a higher level and not waste any resources on it. * master:
Diffstat (limited to 'include')
-rwxr-xr-xinclude/diaspora.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index 37d5990ee..06df9c24a 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2283,6 +2283,11 @@ function diaspora_send_mail($item,$owner,$contact) {
function diaspora_transmit($owner,$contact,$slap,$public_batch) {
+ $enabled = intval(get_config('system','diaspora_enabled'));
+ if(! $enabled) {
+ return 200;
+ }
+
$a = get_app();
$logid = random_string(4);
$dest_url = (($public_batch) ? $contact['batch'] : $contact['notify']);