diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-08 15:49:45 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-08 15:49:45 +0200 |
| commit | 0c0e43e110a9f4f42ca7b5fa109c608424781edd (patch) | |
| tree | fe190aa5a337223351d28e82eb9f4f928932b7bc /phpBB/includes | |
| parent | 73f9e7936a266b174b65812af4d2a6ea648db048 (diff) | |
| parent | 7a60cdd1d324609b95865673d3204598a0078c38 (diff) | |
| download | forums-0c0e43e110a9f4f42ca7b5fa109c608424781edd.tar forums-0c0e43e110a9f4f42ca7b5fa109c608424781edd.tar.gz forums-0c0e43e110a9f4f42ca7b5fa109c608424781edd.tar.bz2 forums-0c0e43e110a9f4f42ca7b5fa109c608424781edd.tar.xz forums-0c0e43e110a9f4f42ca7b5fa109c608424781edd.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14219] Add email to inactive user listing
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index e030d63ef4..df445394db 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -278,6 +278,7 @@ class acp_inactive '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']), + 'USER_EMAIL' => $row['user_email'], 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&mode=overview&u={$row['user_id']}"), 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id={$row['user_id']}&sr=posts") : '', |