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

Use the upstream function to get effectiveUrl

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-01-13 14:00:05 +01:00
parent eceafb84de
commit e75472f460
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -632,7 +632,7 @@ class Ostatus_profile extends Managed_DataObject
// Check if we have a non-canonical URL
$finalUrl = $response->getUrl();
$finalUrl = $response->getEffectiveUrl();
if ($finalUrl != $profile_url) {
@@ -649,7 +649,7 @@ class Ostatus_profile extends Managed_DataObject
preg_replace('/\s*;.*$/', '', $response->getHeader('Content-Type')),
array('application/rss+xml', 'application/atom+xml', 'application/xml', 'text/xml'))
) {
$hints['feedurl'] = $response->getUrl();
$hints['feedurl'] = $response->getEffectiveUrl();
} else {
// Try to get some hCard data