Merge pull request #6474 from tobiasd/2019.01-CHANGELOG

[friendica.git] / mod / manage.php

diff --git a/mod/manage.php b/mod/manage.php
index b98fcac6f747bae0c58254b5aa2348dfd0f86d81..4d0b65de1533e480dab6d1764910f5b440d9ac86 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -6,11 +6,10 @@ use Friendica\App;
 use Friendica\Core\Authentication;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 
-require_once "include/text.php";
-
 function manage_post(App $a) {
 
        if (! local_user()) {
@@ -20,7 +19,7 @@ function manage_post(App $a) {
        $uid = local_user();
        $orig_record = $a->user;
 
-       if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
+       if(!empty($_SESSION['submanage'])) {
                $r = q("select * from user where uid = %d limit 1",
                        intval($_SESSION['submanage'])
                );
@@ -36,7 +35,7 @@ function manage_post(App $a) {
 
        $submanage = $r;
 
-       $identity = (x($_POST['identity']) ? intval($_POST['identity']) : 0);
+       $identity = (!empty($_POST['identity']) ? intval($_POST['identity']) : 0);
        if (!$identity) {
                return;
        }
@@ -100,13 +99,13 @@ function manage_post(App $a) {
        unset($_SESSION['mobile-theme']);
        unset($_SESSION['page_flags']);
        unset($_SESSION['return_path']);
-       if (x($_SESSION, 'submanage')) {
+       if (!empty($_SESSION['submanage'])) {
                unset($_SESSION['submanage']);
        }
-       if (x($_SESSION, 'sysmsg')) {
+       if (!empty($_SESSION['sysmsg'])) {
                unset($_SESSION['sysmsg']);
        }
-       if (x($_SESSION, 'sysmsg_info')) {
+       if (!empty($_SESSION['sysmsg_info'])) {
                unset($_SESSION['sysmsg_info']);
        }
 
@@ -176,7 +175,7 @@ function manage_content(App $a) {
                $identities[$key]['notifications'] = $notifications;
        }
 
-       $o = replace_macros(get_markup_template('manage.tpl'), [
+       $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('manage.tpl'), [
                '$title' => L10n::t('Manage Identities and/or Pages'),
                '$desc' => L10n::t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
                '$choose' => L10n::t('Select an identity to manage: '),