GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Add nohub config setting to allowed non-PuSH feeds

Browse Source
This commit is contained in:
Mikael Nordfeldth
2015-01-16 01:10:55 +01:00
parent 19f3cc112f
commit ba9abb3c57
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1141,8 +1141,9 @@ class Ostatus_profile extends Managed_DataObject
?: $discover->getAtomLink(Salmon::NS_REPLIES);
$hints['salmon'] = $salmonuri;
if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
if (!$huburi && !common_config('feedsub', 'fallback_hub') && !common_config('feedsub', 'nohub')) {
// We can only deal with folks with a PuSH hub
// unless we have something similar available locally.
throw new FeedSubNoHubException();
}
@@ -1534,7 +1535,7 @@ class Ostatus_profile extends Managed_DataObject
$huburi = $discover->getHubLink();
}
if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
if (!$huburi && !common_config('feedsub', 'fallback_hub') && !common_config('feedsub', 'nohub')) {
// We can only deal with folks with a PuSH hub
throw new FeedSubNoHubException();
}