mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeus

Browse Source 
* vsephpbb/ticket/11098:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
This commit is contained in:
Joas Schilling
2014-04-10 12:08:01 +02:00
parent 15dfa9bba2 80bc30214f
commit 377fb770fb
4 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/ucp/ucp_profile.php
View File

@@ -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,