diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-07 16:55:57 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-07 16:55:57 +0200 |
| commit | b13393078c80a96b90e22e5e54023d6c72c170ea (patch) | |
| tree | 307989393a2ba42cc6c6c4748c6e90e2f109830b /phpBB/includes/acp/acp_inactive.php | |
| parent | f3ea34b3110a2fea1a87c34c8683c1939dff7fef (diff) | |
| parent | cf62b303a639df4e6d5f3af3b262a757752bab36 (diff) | |
| download | forums-b13393078c80a96b90e22e5e54023d6c72c170ea.tar forums-b13393078c80a96b90e22e5e54023d6c72c170ea.tar.gz forums-b13393078c80a96b90e22e5e54023d6c72c170ea.tar.bz2 forums-b13393078c80a96b90e22e5e54023d6c72c170ea.tar.xz forums-b13393078c80a96b90e22e5e54023d6c72c170ea.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/acp/acp_users.php
Diffstat (limited to 'phpBB/includes/acp/acp_inactive.php')
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 3a72cf1fe6..e030d63ef4 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -275,7 +275,7 @@ class acp_inactive 'REMINDED_EXPLAIN' => $user->lang('USER_LAST_REMINDED', (int) $row['user_reminded'], $user->format_date($row['user_reminded_time'])), - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview')), + 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview&redirect=acp_inactive')), 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), |