diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-17 20:32:07 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-17 20:32:07 +0200 |
| commit | fb34a7aa647b9faf3dba62ab63424de0ef5f52fc (patch) | |
| tree | 389accd8195cfc05f385b68738f4c39966b0d37e /phpBB | |
| parent | 6980b3dcfde13a7bf3c3986fb1add6ce0f5d8c79 (diff) | |
| parent | 97350944e3bcc4042ff030af4eb130facdd253c1 (diff) | |
| download | forums-fb34a7aa647b9faf3dba62ab63424de0ef5f52fc.tar forums-fb34a7aa647b9faf3dba62ab63424de0ef5f52fc.tar.gz forums-fb34a7aa647b9faf3dba62ab63424de0ef5f52fc.tar.bz2 forums-fb34a7aa647b9faf3dba62ab63424de0ef5f52fc.tar.xz forums-fb34a7aa647b9faf3dba62ab63424de0ef5f52fc.zip | |
Merge remote-tracking branch 'github-exreaction/ticket/7598' into develop
* github-exreaction/ticket/7598:
[ticket/7598] Use $user->lang['COMMA_SEPARATOR']
[ticket/7598] Inactive users action notification (ACP)
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 78d6a0b2f3..f098b772ee 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -136,6 +136,8 @@ class acp_inactive add_log('admin', 'LOG_USER_ACTIVE', $row['username']); add_log('user', $row['user_id'], 'LOG_USER_ACTIVE_USER'); } + + trigger_error(sprintf($user->lang['LOG_INACTIVE_ACTIVATE'], implode($user->lang['COMMA_SEPARATOR'], $user_affected) . ' ' . adm_back_link($this->u_action))); } // For activate we really need to redirect, else a refresh can result in users being deactivated again @@ -159,6 +161,8 @@ class acp_inactive } add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected)); + + trigger_error(sprintf($user->lang['LOG_INACTIVE_DELETE'], implode($user->lang['COMMA_SEPARATOR'], $user_affected) . ' ' . adm_back_link($this->u_action))); } else { @@ -230,7 +234,8 @@ class acp_inactive $db->sql_query($sql); add_log('admin', 'LOG_INACTIVE_REMIND', implode(', ', $usernames)); - unset($usernames); + + trigger_error(sprintf($user->lang['LOG_INACTIVE_REMIND'], implode($user->lang['COMMA_SEPARATOR'], $usernames) . ' ' . adm_back_link($this->u_action))); } $db->sql_freeresult($result); |