Merge branch 'contact-media' of github.com:annando/friendica into contact-media

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

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 8d17f96783238c76242d0bd29d4194b9f627d35f..95bddcd6553b5d6c4e0efb7e428d5c6de086466d 100644 (file)
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -72,7 +72,7 @@ class Salmon
                                                $ret[$x] = substr($ret[$x], 5);
                                        }
                                } elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
-                                       $ret[$x] = DI::httpRequest()->fetch($ret[$x]);
+                                       $ret[$x] = DI::httpClient()->fetch($ret[$x]);
                                }
                        }
                }
@@ -155,7 +155,7 @@ class Salmon
                $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                // slap them
-               $postResult = DI::httpRequest()->post($url, $salmon, [
+               $postResult = DI::httpClient()->post($url, $salmon, [
                        'Content-type' => 'application/magic-envelope+xml',
                        'Content-length' => strlen($salmon),
                ]);
@@ -180,7 +180,7 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = DI::httpRequest()->post($url, $salmon, [
+                       $postResult = DI::httpClient()->post($url, $salmon, [
                                'Content-type' => 'application/magic-envelope+xml',
                                'Content-length' => strlen($salmon),
                        ]);
@@ -203,7 +203,7 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = DI::httpRequest()->post($url, $salmon, [
+                       $postResult = DI::httpClient()->post($url, $salmon, [
                                'Content-type' => 'application/magic-envelope+xml',
                                'Content-length' => strlen($salmon)]);
                        $return_code = $postResult->getReturnCode();