diff options
author | friendica <info@friendica.com> | 2015-01-28 16:06:36 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-28 16:06:36 -0800 |
commit | da842da6839a8feeac4ef1084dce576de34fa874 (patch) | |
tree | 5535e4107e8d9762c20748735948c14c8cbb82ae /include/diaspora.php | |
parent | f0b900057a63a5c9efb8f35daa05b6c7e79d0adb (diff) | |
parent | 54fd8b21db2d8f3841cf590f88611a1d4f44ce48 (diff) | |
download | volse-hubzilla-da842da6839a8feeac4ef1084dce576de34fa874.tar.gz volse-hubzilla-da842da6839a8feeac4ef1084dce576de34fa874.tar.bz2 volse-hubzilla-da842da6839a8feeac4ef1084dce576de34fa874.zip |
Merge branch 'master' into pocorate
Diffstat (limited to 'include/diaspora.php')
-rwxr-xr-x | include/diaspora.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index e494aac0f..767758164 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -15,8 +15,14 @@ function diaspora_dispatch_public($msg) { return; } - // find everybody following or allowing this author + $sys_disabled = true; + + if(! get_config('system','disable_discover_tab')) { + $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 +35,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'); |