mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus

Browse Source 
* 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
This commit is contained in:
Nils Adermann
2014-04-10 14:22:36 -07:00
parent 90ebd49a2b 2fcfca7369
commit 497d81af68
5 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/acp/acp_users.php
View File

@@ -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']);
}
}
}