Author: nickvergessen
Date: Sat Aug 1 12:43:39 2009
New Revision: 9903
Log:
Fix Bug #37585 - Correctly log action when users request to join a group
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/functions_user.php
branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Aug 1 12:43:39 2009
***************
*** 182,187 ****
--- 182,188 ----
<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>
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_user.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_user.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_user.php Sat Aug 1 12:43:39 2009
***************
*** 2793,2799 ****
$group_name = get_group_name($group_id);
}
! $log = ($leader) ? 'LOG_MODS_ADDED' : 'LOG_USERS_ADDED';
add_log('admin', $log, $group_name, implode(', ', $username_ary));
--- 2793,2799 ----
$group_name = get_group_name($group_id);
}
! $log = ($leader) ? 'LOG_MODS_ADDED' : (($pending) ? 'LOG_USERS_PENDING' : 'LOG_USERS_ADDED');
add_log('admin', $log, $group_name, implode(', ', $username_ary));
Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Sat Aug 1 12:43:39 2009
***************
*** 570,577 ****
'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_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',
--- 570,578 ----
'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_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',
|
