diff options
Diffstat (limited to 'phpBB/includes/ucp/ucp_activate.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 355c9898c2..9589b6928b 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -27,8 +27,7 @@ class ucp_activate function main($id, $mode) { - global $config, $phpbb_root_path, $phpEx; - global $db, $user, $auth, $template; + global $db, $user, $auth, $template, $config; $user_id = request_var('u', 0); $key = request_var('k', ''); @@ -47,7 +46,7 @@ class ucp_activate if ($user_row['user_type'] <> USER_INACTIVE && !$user_row['user_newpasswd']) { - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, append_sid('index')); trigger_error('ALREADY_ACTIVATED'); } @@ -75,7 +74,7 @@ class ucp_activate if (!$update_password) { - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); + include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT); user_active_flip('activate', $user_row['user_id']); @@ -87,7 +86,7 @@ class ucp_activate if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password) { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); + include_once(PHPBB_ROOT_PATH . 'includes/functions_messenger.' . PHP_EXT); $messenger = new messenger(false); @@ -120,7 +119,7 @@ class ucp_activate } } - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, append_sid('index')); trigger_error($user->lang[$message]); } } |