diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-08-01 11:43:39 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-08-01 11:43:39 +0000 |
| commit | 530f4963cbc12e0f47f20c13c70587a60d3ad37c (patch) | |
| tree | cf92fba109b74fcc8a397f6761e9f85faddba39b | |
| parent | ac857b2e0ae6a3d95218f03736f1835ca8d09b74 (diff) | |
| download | forums-530f4963cbc12e0f47f20c13c70587a60d3ad37c.tar forums-530f4963cbc12e0f47f20c13c70587a60d3ad37c.tar.gz forums-530f4963cbc12e0f47f20c13c70587a60d3ad37c.tar.bz2 forums-530f4963cbc12e0f47f20c13c70587a60d3ad37c.tar.xz forums-530f4963cbc12e0f47f20c13c70587a60d3ad37c.zip | |
Fix Bug #37585 - Correctly log action when users request to join a group
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9903 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a91ecc3bcb..25f4f04158 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -182,6 +182,7 @@ <li>[Fix] Correctly add user to a group making it a default one. (Bug #48345 - Patch by rxu)</li> <li>[Fix] Add log entry when copying forum permissions.</li> <li>[Fix] Min/max characters per posts also affects polls option (Bug #47295 - Patch by nickvergessen)</li> + <li>[Fix] Correctly log action when users request to join a group (Bug #37585 - Patch by nickvergessen)</li> <li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 324be2b1ed..ca6aae2540 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2793,7 +2793,7 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, $group_name = get_group_name($group_id); } - $log = ($leader) ? 'LOG_MODS_ADDED' : 'LOG_USERS_ADDED'; + $log = ($leader) ? 'LOG_MODS_ADDED' : (($pending) ? 'LOG_USERS_PENDING' : 'LOG_USERS_ADDED'); add_log('admin', $log, $group_name, implode(', ', $username_ary)); diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 7225d3114f..9a9b89652a 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -570,8 +570,9 @@ $lang = array_merge($lang, array( 'LOG_GROUP_REMOVE' => '<strong>Members removed from usergroup</strong> %1$s<br />» %2$s', 'LOG_GROUP_UPDATED' => '<strong>Usergroup details updated</strong><br />» %s', 'LOG_MODS_ADDED' => '<strong>Added new leaders to usergroup</strong> %1$s<br />» %2$s', - 'LOG_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s', 'LOG_USERS_ADDED' => '<strong>Added new members to usergroup</strong> %1$s<br />» %2$s', + 'LOG_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s', + 'LOG_USERS_PENDING' => '<strong>Users requested to join group “%1$s” and need to be approved</strong><br />» %2$s', 'LOG_IMAGESET_ADD_DB' => '<strong>Added new imageset to database</strong><br />» %s', 'LOG_IMAGESET_ADD_FS' => '<strong>Add new imageset on filesystem</strong><br />» %s', |