From 80bc30214f0d27813b04580a9ddd8243ddb3cfb0 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 9 Apr 2014 23:17:30 -0700 Subject: [PATCH] [ticket/11098] Fix error reporting on the autologin key pages PHPBB3-11098 --- phpBB/includes/ucp/ucp_profile.php | 4 ++-- .../prosilver/template/ucp_profile_autologin_keys.html | 8 +------- .../subsilver2/template/ucp_profile_autologin_keys.html | 9 +++------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 76f8988fb9..a14f79f9fd 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -679,8 +679,6 @@ class ucp_profile while ($row = $db->sql_fetchrow($result)) { $template->assign_block_vars('sessions', array( - 'errors' => $error, - 'KEY' => $row['key_id'], 'IP' => $row['last_ip'], 'LOGIN_TIME' => $user->format_date($row['last_login']), @@ -693,6 +691,8 @@ class ucp_profile } $template->assign_vars(array( + 'ERROR' => (sizeof($error)) ? implode('
', $error) : '', + 'L_TITLE' => $user->lang['UCP_PROFILE_' . strtoupper($mode)], 'S_HIDDEN_FIELDS' => $s_hidden_fields, diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html index 13448ead30..6fec0b8aed 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html +++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html @@ -5,14 +5,8 @@

{L_TITLE}

- -

- - {errors}
- -

-

{L_PROFILE_AUTOLOGIN_KEYS}

+

{ERROR}

diff --git a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html index 5b7601bc81..3f63319b59 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html @@ -4,13 +4,10 @@ - + + - +
{L_TITLE}
- - {errors}
- - 		{ERROR}