aboutsummaryrefslogtreecommitdiffstats
path: root/include/diaspora.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-28 15:23:00 -0800
committerfriendica <info@friendica.com>2015-01-28 15:23:00 -0800
commit2c02f1184cc576eaced4b72ae7ec6fd54c347ea7 (patch)
treead90de8e33802f5ebd7a030f855007c31719f7ba /include/diaspora.php
parentdb1998e0c8f3050c4d93c26a5af69773a55c17d2 (diff)
downloadvolse-hubzilla-2c02f1184cc576eaced4b72ae7ec6fd54c347ea7.tar.gz
volse-hubzilla-2c02f1184cc576eaced4b72ae7ec6fd54c347ea7.tar.bz2
volse-hubzilla-2c02f1184cc576eaced4b72ae7ec6fd54c347ea7.zip
allow diaspora posts to be delivered to the discover channel unless prohibited from doing so.
Diffstat (limited to 'include/diaspora.php')
-rwxr-xr-xinclude/diaspora.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index e494aac0f..655f5750a 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -15,8 +15,10 @@ function diaspora_dispatch_public($msg) {
return;
}
- // find everybody following or allowing this author
+ $sys_disabled = get_config('system','disable_diaspora_discover_tab');
+ $sys = (($sys_disabled) ? null : get_sys_channel());
+ // find everybody following or allowing this author
$r = q("SELECT * from channel where channel_id in ( SELECT abook_channel from abook left join xchan on abook_xchan = xchan_hash WHERE xchan_network like '%%diaspora%%' and xchan_addr = '%s' )",
dbesc($msg['author'])
@@ -29,6 +31,8 @@ function diaspora_dispatch_public($msg) {
logger('diaspora_public: delivering to: ' . $rr['channel_name'] . ' (' . $rr['channel_address'] . ') ');
diaspora_dispatch($rr,$msg);
}
+ if($sys)
+ diaspora_dispatch($sys,$msg);
}
else
logger('diaspora_public: no subscribers');