Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

Conflicts:
	plugins/OStatus/OStatusPlugin.php

master vs. nightly thing
This commit is contained in:
Mikael Nordfeldth
2015-11-05 16:16:02 +01:00
7 changed files with 281 additions and 24 deletions

View File

@@ -148,7 +148,7 @@ class WebFingerPlugin extends Plugin
$url = common_local_url('webfinger') . '?resource='.$acct;
foreach (array(Discovery::JRD_MIMETYPE, Discovery::XRD_MIMETYPE) as $type) {
header('Link: <'.$url.'>; rel="'. Discovery::LRDD_REL.'"; type="'.$type.'"');
header('Link: <'.$url.'>; rel="'. Discovery::LRDD_REL.'"; type="'.$type.'"', false);
}
}
}