Move "Network::finalUrl" to "HTTPRequest" class

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index a204f3e31a88a8c4eb596d38014443bb7bc02a1e..24030ce6a2bfb9f27f3da9b855ac207e0558f961 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -57,7 +57,6 @@ use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 function statusnet_install()
@@ -1450,7 +1449,7 @@ function statusnet_convertmsg(App $a, $body)
 
                        Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG);
 
-                       $expanded_url = Network::finalUrl($match[1]);
+                       $expanded_url = 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 f93b12b44da334a67eda30de49329ef96da9af7d..cea39842168dc026147e6d2ec907f6a1f77771cc 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -89,7 +89,6 @@ use Friendica\Protocol\Activity;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
@@ -1297,7 +1296,7 @@ function twitter_expand_entities($body, stdClass $status, $picture)
 
                        $expanded_url = $url->expanded_url;
 
-                       $final_url = Network::finalUrl($url->expanded_url);
+                       $final_url = HTTPRequest::finalUrl($url->expanded_url);
 
                        $oembed_data = OEmbed::fetchURL($final_url);