Fixing double encoding here as well

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index 1ca04af50dc2bce40e2e56ba1d2ac03228a2a702..8623d3c4ac122d5b1695c1de3065024af39c89ff 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -8,9 +8,11 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module;
+use Friendica\Util\Strings;
 
 function crepair_init(App $a)
 {
@@ -23,7 +25,7 @@ function crepair_init(App $a)
                $contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
        }
 
-       if (!x($a->page, 'aside')) {
+       if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }
 
@@ -60,7 +62,7 @@ function crepair_post(App $a)
        $attag       = defaults($_POST, 'attag'      , '');
        $photo       = defaults($_POST, 'photo'      , '');
        $remote_self = defaults($_POST, 'remote_self', false);
-       $nurl        = normalise_link($url);
+       $nurl        = Strings::normaliseLink($url);
 
        $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `nurl` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d
                WHERE `id` = %d AND `uid` = %d",
@@ -136,8 +138,8 @@ function crepair_content(App $a)
 
        $tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
 
-       $tpl = get_markup_template('crepair.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('crepair.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$tab_str'        => $tab_str,
                '$warning'        => $warning,
                '$info'           => $info,