Merge pull request #6226 from annando/oembed-array

[friendica.git] / mod / feedtest.php

diff --git a/mod/feedtest.php b/mod/feedtest.php
index 9217b85d541ffe3190eae9f701d0e406d847e776..edb75aefc160cb1eb6d57da709a28cf62c5d6100 100644 (file)
--- a/mod/feedtest.php
+++ b/mod/feedtest.php
@@ -6,6 +6,8 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Feed;
 use Friendica\Util\Network;
@@ -25,14 +27,13 @@ function feedtest_content(App $a)
        if (!empty($_REQUEST['url'])) {
                $url = $_REQUEST['url'];
 
-               $importer = dba::selectFirst('user', [], ['uid' => local_user()]);
+               $importer = DBA::selectFirst('user', [], ['uid' => local_user()]);
 
                $contact_id = Contact::getIdForURL($url, local_user(), true);
 
-               $contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
+               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
 
-               $ret = Network::curl($contact['poll']);
-               $xml = $ret['body'];
+               $xml = Network::fetchUrl($contact['poll']);
 
                $dummy = null;
                $import_result = Feed::import($xml, $importer, $contact, $dummy, true);
@@ -43,8 +44,8 @@ function feedtest_content(App $a)
                ];
        }
 
-       $tpl = get_markup_template('feedtest.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('feedtest.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$url'    => ['url', L10n::t('Source URL'), defaults($_REQUEST, 'url', ''), ''],
                '$result' => $result
        ]);