diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-10 22:17:18 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-10 22:17:18 +0200 |
| commit | 2c7fbb9e612586dd0efa682b3669e936c6625ac4 (patch) | |
| tree | b26822585049f811c14b44e5de62970f6b06dfb7 /phpBB | |
| parent | d465e7e438f7313155f095f96c806e72571a58bb (diff) | |
| parent | d42401056c775b6011f9cdb70e47358c3c80139c (diff) | |
| download | forums-2c7fbb9e612586dd0efa682b3669e936c6625ac4.tar forums-2c7fbb9e612586dd0efa682b3669e936c6625ac4.tar.gz forums-2c7fbb9e612586dd0efa682b3669e936c6625ac4.tar.bz2 forums-2c7fbb9e612586dd0efa682b3669e936c6625ac4.tar.xz forums-2c7fbb9e612586dd0efa682b3669e936c6625ac4.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13042] Remove unused variables
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 64959a05f3..1de70d4210 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2829,8 +2829,6 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa if ($result['status'] == LOGIN_SUCCESS) { $redirect = request_var('redirect', "{$phpbb_root_path}index.$phpEx"); - $message = ($l_success) ? $l_success : $user->lang['LOGIN_REDIRECT']; - $l_redirect = ($admin) ? $user->lang['PROCEED_TO_ACP'] : (($redirect === "{$phpbb_root_path}index.$phpEx" || $redirect === "index.$phpEx") ? $user->lang['RETURN_INDEX'] : $user->lang['RETURN_PAGE']); // append/replace SID (may change during the session for AOL users) $redirect = reapply_sid($redirect); |