From 2dcb7cc2de448c664bbc9a7112f9cb13dc15c516 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 8 Oct 2018 21:15:56 +0200 Subject: Replaced some global `$user` variables --- includes/pages/guest_login.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'includes/pages/guest_login.php') diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 95e63bbc..1bb39d01 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -34,7 +34,8 @@ function logout_title() */ function guest_register() { - global $user, $privileges; + global $privileges; + $user = Auth()->user(); $tshirt_sizes = config('tshirt_sizes'); $enable_tshirt_size = config('enable_tshirt_size'); $min_password_length = config('min_password_length'); @@ -70,7 +71,7 @@ function guest_register() } } - if (!in_array('register', $privileges) || (!isset($user) && !config('registration_enabled'))) { + if (!in_array('register', $privileges) || (!$user && !config('registration_enabled'))) { error(__('Registration is disabled.')); return page_with_title(register_title(), [ @@ -269,7 +270,7 @@ function guest_register() success(__('Angel registration successful!')); // User is already logged in - that means a supporter has registered an angel. Return to register page. - if (isset($user)) { + if ($user) { redirect(page_link_to('register')); } -- cgit v1.2.3-54-g00ecf