Remove $binary flag for HTTPRequest::get(), HTTPRequest::fetch(), HTTPRequest::fetchA...

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 23aed60f9c362db6bf894ed337b9f1937a2d2e97..9631a11ab5f3338edee71d193524b552b9e63e3c 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -155,7 +155,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
                        continue;
                }
                $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
-               $curlResult = DI::httpRequest()->fetchFull($url, true, 0, '', $cookiejar);
+               $curlResult = DI::httpRequest()->fetchFull($url, 0, '', $cookiejar);
                $attachments[$url] = [
                        'data' => $curlResult->getBody(),
                        'guid' => hash("crc32", $url),

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index cea197178cc8abbf275d2ff9c30605ce8aaf8ff3..cd44b682e6ddf5e760cd65ade8e4ed152cee7252 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -1590,7 +1590,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 
 function pumpio_reachable($url)
 {
-       return DI::httpRequest()->get($url, false, ['timeout' => 10])->isSuccess();
+       return DI::httpRequest()->get($url, ['timeout' => 10])->isSuccess();
 }
 
 /*

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 0ab711cad3dac4ec41c71a9d31a2e7ac9514f95c..05853025a5b343fb42ad29a2627bac2ce2c1a835 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -1453,7 +1453,7 @@ function statusnet_convertmsg(App $a, $body)
                        } elseif ($oembed_data->type != "link") {
                                $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
                        } else {
-                               $img_str = DI::httpRequest()->fetch($expanded_url, true, 4);
+                               $img_str = DI::httpRequest()->fetch($expanded_url, 4);
 
                                $tempfile = tempnam(get_temppath(), "cache");
                                file_put_contents($tempfile, $img_str);

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 6f3978f25134bed40ce4f6a77535670c46cc487e..d04f3a552af8c2facde1b926fb120496b7e1e7eb 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1315,7 +1315,7 @@ function twitter_expand_entities($body, stdClass $status, $picture)
                        } elseif ($oembed_data->type != 'link') {
                                $replace = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]';
                        } else {
-                               $img_str = DI::httpRequest()->fetch($final_url, true, 4);
+                               $img_str = DI::httpRequest()->fetch($final_url, 4);
 
                                $tempfile = tempnam(get_temppath(), 'cache');
                                file_put_contents($tempfile, $img_str);