[ticket/11098] Fix error reporting on the autologin key pages

PHPBB3-11098

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('<br />', $error) : '',
+
 			'L_TITLE'	=> $user->lang['UCP_PROFILE_' . strtoupper($mode)],
 
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,

phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html

@@ -5,14 +5,8 @@
 <h2>{L_TITLE}</h2>
 <div class="panel">
 	<div class="inner">
-		<!-- IF .errors -->
-		<p class="error">
-			<!-- BEGIN errors -->
-				{errors} <br />
-			<!-- END errors -->
-		</p>
-		<!-- ENDIF -->
 		<p>{L_PROFILE_AUTOLOGIN_KEYS}</p>
+		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
 		<table class="table1">
 			<thead>
 				<tr>

phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html

@@ -4,13 +4,10 @@
 <tr>
 	<th colspan="4">{L_TITLE}</th>
 </tr>
-<!-- IF .errors -->
+
+<!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">
-			<!-- BEGIN errors -->
-				{errors} <br />
-			<!-- END errors -->
-		</td>
+		<td class="row3" colspan="4" align="center"><span class="genmed error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->