eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Salmon only has one "rel" value now, so start deprecating

Browse Source
This commit is contained in:
Mikael Nordfeldth
2013-11-01 17:00:12 +01:00
parent bd86519d50
commit 7ddd561837
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -1110,7 +1110,10 @@ class Ostatus_profile extends Managed_DataObject
$huburi = $discover->getHubLink();
$hints['hub'] = $huburi;
$salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
// XXX: NS_REPLIES is deprecated anyway, so let's remove it in the future.
$salmonuri = $discover->getAtomLink(Salmon::REL_SALMON)
?: $discover->getAtomLink(Salmon::NS_REPLIES);
$hints['salmon'] = $salmonuri;
if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
@@ -1489,7 +1492,9 @@ class Ostatus_profile extends Managed_DataObject
$discover = new FeedDiscovery();
$discover->discoverFromFeedURL($hints['feedurl']);
}
$salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
// XXX: NS_REPLIES is deprecated anyway, so let's remove it in the future.
$salmonuri = $discover->getAtomLink(Salmon::REL_SALMON)
?: $discover->getAtomLink(Salmon::NS_REPLIES);
}
if (array_key_exists('hub', $hints)) {