diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 12:08:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 12:08:01 +0200 |
| commit | 377fb770fb37f4fb797ab234e44c4d387d4f8a64 (patch) | |
| tree | 45ca821cdeb819cb5cb7347fc122f78cc91d0e61 /phpBB/includes/ucp | |
| parent | 15dfa9bba2556e93c899e7266168bfe4fea9ed3b (diff) | |
| parent | 80bc30214f0d27813b04580a9ddd8243ddb3cfb0 (diff) | |
| download | forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.tar forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.tar.gz forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.tar.bz2 forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.tar.xz forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeus
* 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
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 |
1 files changed, 2 insertions, 2 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('<br />', $error) : '', + 'L_TITLE' => $user->lang['UCP_PROFILE_' . strtoupper($mode)], 'S_HIDDEN_FIELDS' => $s_hidden_fields, |