Merge pull request #6483 from MrPetovan/bug/fixes-after-2019-03-develop-rebase

[friendica.git] / mod / uimport.php

diff --git a/mod/uimport.php b/mod/uimport.php
index 3c80b671be45a308f4449a418705211f059e8de0..dfeab8a2f6e4d45988b567ab86c8ea8056d3e9d3 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -9,6 +9,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\UserImport;
+use Friendica\Core\Renderer;
 
 function uimport_post(App $a)
 {
@@ -41,15 +42,15 @@ function uimport_content(App $a)
        }
 
 
-       if (x($_SESSION, 'theme')) {
+       if (!empty($_SESSION['theme'])) {
                unset($_SESSION['theme']);
        }
-       if (x($_SESSION, 'mobile-theme')) {
+       if (!empty($_SESSION['mobile-theme'])) {
                unset($_SESSION['mobile-theme']);
        }
 
-       $tpl = get_markup_template("uimport.tpl");
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate("uimport.tpl");
+       return Renderer::replaceMacros($tpl, [
                '$regbutt' => L10n::t('Import'),
                '$import' => [
                        'title' => L10n::t("Move account"),