diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:22:36 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:22:36 -0700 |
| commit | 497d81af68b4e224ec5a7fe9429e391f8087aaef (patch) | |
| tree | 9d9ceb853515afff314e1e94b74cf4937567c87f /phpBB/includes/acp/acp_users.php | |
| parent | 90ebd49a2b64b731c037dceb5c85d3d81b152947 (diff) | |
| parent | 2fcfca73696bd7cc24dbadee147ee7a72526b3b7 (diff) | |
| download | forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.gz forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.bz2 forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.tar.xz forums-497d81af68b4e224ec5a7fe9429e391f8087aaef.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus
* github-nickvergessen/ticket/12113:
[ticket/12113] Fix view_log() tests
[ticket/12113] Correctly use plurals when deleting user warnings
[ticket/12113] Allow log entries to use plurals
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 59b6f49436..a720334ed2 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1253,17 +1253,13 @@ class acp_users WHERE user_id = $user_id"; $db->sql_query($sql); - switch ($log_warnings) + if ($log_warnings) { - case 2: - add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings); - break; - case 1: - add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']); - break; - default: - add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']); - break; + add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings); + } + else + { + add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']); } } } |