Merge pull request #8253 from tobiasd/20200208-msg

[friendica.git] / mod / oexchange.php

diff --git a/mod/oexchange.php b/mod/oexchange.php
index a55ee56d21d90bb74f8cc460208f5049ac4b6267..3eb13460d4727c4108277ad6d0cca3c36669bed3 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -3,9 +3,8 @@
  * @file mod/oexchange.php
  */
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Module\Security\Login;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -15,7 +14,7 @@ function oexchange_init(App $a) {
        if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
                $tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
-               $o = Renderer::replaceMacros($tpl, ['$base' => System::baseUrl()]);
+               $o = Renderer::replaceMacros($tpl, ['$base' => DI::baseUrl()]);
                echo $o;
                exit();
        }
@@ -29,7 +28,7 @@ function oexchange_content(App $a) {
        }
 
        if (($a->argc > 1) && $a->argv[1] === 'done') {
-               info(L10n::t('Post successful.') . EOL);
+               info(DI::l10n()->t('Post successful.') . EOL);
                return;
        }
 
@@ -42,7 +41,7 @@ function oexchange_content(App $a) {
        $tags = ((!empty($_REQUEST['tags']))
                ? '&tags=' . urlencode(Strings::escapeTags(trim($_REQUEST['tags']))) : '');
 
-       $s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
+       $s = Network::fetchUrl(DI::baseUrl() . '/parse_url?url=' . $url . $title . $description . $tags);
 
        if (!strlen($s)) {
                return;