Move "HTTPRequest::finalUrl" dynamic

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 24030ce6a2bfb9f27f3da9b855ac207e0558f961..7ec3a2d5dbbe09f1dad3943aee14c06a0e7bd7ff 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -1449,7 +1449,7 @@ function statusnet_convertmsg(App $a, $body)
 
                        Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG);
 
-                       $expanded_url = HTTPRequest::finalUrl($match[1]);
+                       $expanded_url = DI::httpRequest()->finalUrl($match[1]);
 
                        Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG);
 

diff --git a/twitter/twitter.php b/twitter/twitter.php
index cea39842168dc026147e6d2ec907f6a1f77771cc..30195427d9eab23e7cb4f64efabf96435ce67513 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1296,7 +1296,7 @@ function twitter_expand_entities($body, stdClass $status, $picture)
 
                        $expanded_url = $url->expanded_url;
 
-                       $final_url = HTTPRequest::finalUrl($url->expanded_url);
+                       $final_url = DI::httpRequest()->finalUrl($url->expanded_url);
 
                        $oembed_data = OEmbed::fetchURL($final_url);