Merge pull request #9436 from nupplaphil/task/test_notices

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index ef38aaebe3853bb17f7a4aa6a375cdc112dcd66f..4b67d8ecb292a5790431ab15adef27b437ec1493 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -738,7 +738,7 @@ class OStatus
 
                self::$conv_list[$conversation] = true;
 
-               $curlResult = DI::httpRequest()->get($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
+               $curlResult = DI::httpRequest()->get($conversation, ['accept_content' => 'application/atom+xml, text/html']);
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -746,8 +746,7 @@ class OStatus
 
                $xml = '';
 
-               if ($curlResult->inHeader('Content-Type') &&
-                       stristr($curlResult->getHeader('Content-Type'), 'application/atom+xml')) {
+               if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
                        $xml = $curlResult->getBody();
                }
 
@@ -932,7 +931,7 @@ class OStatus
                }
 
                $stored = false;
-               $curlResult = DI::httpRequest()->get($related, false, ['accept_content' => 'application/atom+xml, text/html']);
+               $curlResult = DI::httpRequest()->get($related, ['accept_content' => 'application/atom+xml, text/html']);
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -940,8 +939,7 @@ class OStatus
 
                $xml = '';
 
-               if ($curlResult->inHeader('Content-Type') &&
-                       stristr($curlResult->getHeader('Content-Type'), 'application/atom+xml')) {
+               if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
                        Logger::log('Directly fetched XML for URI ' . $related_uri, Logger::DEBUG);
                        $xml = $curlResult->getBody();
                }