Merge pull request #6461 from annando/contacts-post

[friendica.git] / mod / home.php

diff --git a/mod/home.php b/mod/home.php
index 33d736a4e1cba2793efd62c8e576a90135f5740f..02ec51dc0bb796163b4dc223b1779018712c4e18 100644 (file)
--- a/mod/home.php
+++ b/mod/home.php
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Module\Login;
 
@@ -16,11 +17,11 @@ function home_init(App $a) {
        Addon::callHooks('home_init',$ret);
 
        if (local_user() && ($a->user['nickname'])) {
-               goaway(System::baseUrl()."/network");
+               $a->internalRedirect('network');
        }
 
        if (strlen(Config::get('system','singleuser'))) {
-               goaway(System::baseUrl()."/profile/" . Config::get('system','singleuser'));
+               $a->internalRedirect('profile/' . Config::get('system','singleuser'));
        }
 
 }}
@@ -28,10 +29,10 @@ function home_init(App $a) {
 if(! function_exists('home_content')) {
 function home_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']);
        }
 
@@ -53,8 +54,8 @@ function home_content(App $a) {
        Addon::callHooks("home_content",$content);
 
 
-       $tpl = get_markup_template('home.tpl');
-       return replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('home.tpl');
+       return Renderer::replaceMacros($tpl, [
                '$defaultheader' => $defaultheader,
                '$customhome' => $customhome,
                '$login' => $login,