Commit 97bcd0bf authored by Mario's avatar Mario

Merge branch 'cherry-pick-585f6776' into 'master'

diaspora regression from addon2app conversion

See merge request !1
parents da185196 b1cdb180
......@@ -176,7 +176,7 @@ function diaspora_webfinger(&$b) {
// Diaspora requires a salmon link.
// Use this *only* if the gnusoc plugin is not installed and enabled
if((! in_array('gnusoc',\App::$plugins)) || (! intval(get_pconfig($b['channel']['channel_id'],'system','gnusoc_allowed')))) {
if((! in_array('gnusoc',\App::$plugins)) || (! Apps::addon_app_installed($b['channel']['channel_id'], 'gnusoc'))) {
$b['result']['links'][] = [
'rel' => 'salmon',
'href' => z_root() . '/receive/users/' . $b['channel']['channel_guid'] . str_replace('.','',App::get_hostname())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment