diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-08 15:49:39 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-08 15:49:39 +0200 |
| commit | 7a60cdd1d324609b95865673d3204598a0078c38 (patch) | |
| tree | 7a4f597d6ec38b3b9510a0e3f488914a0539e0f1 | |
| parent | 5b7b0894e0a54c117ebf43bd8206e4b3ab8953d8 (diff) | |
| parent | 4830b3eacd13a37c2f61caf7431517d53902659e (diff) | |
| download | forums-7a60cdd1d324609b95865673d3204598a0078c38.tar forums-7a60cdd1d324609b95865673d3204598a0078c38.tar.gz forums-7a60cdd1d324609b95865673d3204598a0078c38.tar.bz2 forums-7a60cdd1d324609b95865673d3204598a0078c38.tar.xz forums-7a60cdd1d324609b95865673d3204598a0078c38.zip | |
Merge pull request #3951 from RMcGirr83/ticket_14219
[ticket/14219] Add email to inactive user listing
* RMcGirr83/ticket_14219:
[ticket/14219] Add email to inactive user listing
| -rw-r--r-- | phpBB/adm/style/acp_inactive.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 409ea46de5..2aa3051f53 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -18,6 +18,7 @@ <thead> <tr> <th>{L_USERNAME}</th> + <th>{L_EMAIL}</th> <th>{L_JOINED}</th> <th>{L_INACTIVE_DATE}</th> <th>{L_LAST_VISIT}</th> @@ -32,6 +33,7 @@ {inactive.USERNAME_FULL} <!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF --> </td> + <td style="vertical-align: top;">{inactive.USER_EMAIL}</td> <td style="vertical-align: top;">{inactive.JOINED}</td> <td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td> <td style="vertical-align: top;">{inactive.LAST_VISIT}</td> diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 4a70401026..5178fc8006 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -274,6 +274,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") : '', |