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

Merge branch 'master' into nightly

Browse Source 
Some merge requests that were aimed at master
This commit is contained in:
Mikael Nordfeldth
2015-11-05 16:07:05 +01:00
parent 1b81131c51 96e0867d4c
commit c950f18546
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/OStatus/classes/FeedSub.php
View File

@@ -355,7 +355,7 @@ class FeedSub extends Managed_DataObject
$response = $client->post($hub, $headers, $post);
$status = $response->getStatus();
// PuSH specificed response status code
if ($status == 202) {
if ($status == 202 || $status == 204) {
common_log(LOG_INFO, __METHOD__ . ': sub req ok, awaiting verification callback');
return;
} else if ($status >= 200 && $status < 300) {

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

@@ -828,11 +828,13 @@ class Ostatus_profile extends Managed_DataObject
}
}
$obj = ActivityUtils::getFeedAuthor($feedEl);
// @todo FIXME: We should check whether this feed has elements
// with different <author> or <dc:creator> elements, and... I dunno.
// Do something about that.
$obj = ActivityObject::fromRssChannel($feedEl);
if(empty($obj)) { $obj = ActivityObject::fromRssChannel($feedEl); }
return self::ensureActivityObjectProfile($obj, $hints);
}