From 8b1c6feabbd27d01a2c5571c3ff8ec5c500cacce Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Thu, 10 Jul 2014 09:35:07 +0000 Subject: [PATCH] Upgrade: Fixed language issue when executing Permission Defaults. --- core/users/permissions_default.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/core/users/permissions_default.php b/core/users/permissions_default.php index ac79271442..b4fb114409 100644 --- a/core/users/permissions_default.php +++ b/core/users/permissions_default.php @@ -23,22 +23,24 @@ Contributor(s): Mark J Crane */ -include "root.php"; -require_once "resources/require.php"; -require_once "resources/check_auth.php"; -if (permission_exists('group_edit')) { - //access granted -} -else { - echo "access denied"; - return; -} +if (!$included) { + include "root.php"; + require_once "resources/require.php"; + require_once "resources/check_auth.php"; + if (permission_exists('group_edit')) { + //access granted + } + else { + echo "access denied"; + return; + } -//add multi-lingual support + //add multi-lingual support require_once "app_languages.php"; foreach($text as $key => $value) { $text[$key] = $value[$_SESSION['domain']['language']['code']]; } +} //permission restore default require_once "core/users/resources/classes/permission.php"; @@ -46,9 +48,11 @@ else { $permission->db = $db; $permission->restore(); -//show a message to the user +if (!$included) { + //show a message to the user $_SESSION["message"] = $text['message-restore']; header("Location: groups.php"); return; +} ?> \ No newline at end of file