aboutsummaryrefslogtreecommitdiffstats
path: root/include/diaspora.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-11 19:35:23 -0700
committerfriendica <info@friendica.com>2015-03-11 19:35:23 -0700
commit64ae17aa6a1bdbc3933422272a391d4e3662f59b (patch)
treeb87f4c0866d9ecfa832d43b7e622e3100386a408 /include/diaspora.php
parenta40c19d19d31bba3fe037a9778c521461e2b0290 (diff)
parentb3a9a6c802170a15cc58fd3af966b35f81c50818 (diff)
downloadvolse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.tar.gz
volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.tar.bz2
volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.zip
Merge branch 'master' into openid
Diffstat (limited to 'include/diaspora.php')
-rwxr-xr-xinclude/diaspora.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index 7295b4261..da55b8fb6 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1287,6 +1287,12 @@ function diaspora_comment($importer,$xml,$msg) {
// our post, so he/she must be a contact of ours and his/her public key
// should be in $msg['key']
+ if($importer['system']) {
+ // don't relay to the sys channel
+ logger('diaspora_comment: relay to sys channel blocked.');
+ return;
+ }
+
$author_signature = base64_decode($author_signature);
if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) {