diff options
author | friendica <info@friendica.com> | 2014-09-04 01:13:01 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-09-04 01:13:01 -0700 |
commit | ca2bf76b06360d6bd3dc386d53c6d7301cd518f3 (patch) | |
tree | f9997ba76aeb1e6ed3d772f54ab7062e3cab711a /include/network.php | |
parent | 1659e0e7ad5511bb2f1d786b5dd5dd10000eabf7 (diff) | |
download | volse-hubzilla-ca2bf76b06360d6bd3dc386d53c6d7301cd518f3.tar.gz volse-hubzilla-ca2bf76b06360d6bd3dc386d53c6d7301cd518f3.tar.bz2 volse-hubzilla-ca2bf76b06360d6bd3dc386d53c6d7301cd518f3.zip |
allow stuff with Diaspora authors to federate in zot conversations even if the local site has diaspora disabled. This way it won't look like folks are talking to themselves.
Diffstat (limited to 'include/network.php')
-rw-r--r-- | include/network.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/network.php b/include/network.php index 5ca60b5fe..5ad391491 100644 --- a/include/network.php +++ b/include/network.php @@ -1033,7 +1033,7 @@ function discover_by_webbie($webbie) { } } - if($diaspora && $diaspora_base && $diaspora_guid && intval(get_config('system','diaspora_enabled'))) { + if($diaspora && $diaspora_base && $diaspora_guid) { $guid = $diaspora_guid; $diaspora_base = trim($diaspora_base,'/'); |