diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-07-07 00:20:28 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-07-07 00:20:28 +0200 |
| commit | a804c2b107178cf8a7789cb207d070b9f0502eec (patch) | |
| tree | 91f6b39a1b70d643c9b11e524ea3c67a2615c2ad | |
| parent | 0dbf91cf631d30979887c2517dbc70be3eac67a3 (diff) | |
| parent | 0bec9897d7583fa6e47f437d9b5921379d7b24aa (diff) | |
| download | forums-a804c2b107178cf8a7789cb207d070b9f0502eec.tar forums-a804c2b107178cf8a7789cb207d070b9f0502eec.tar.gz forums-a804c2b107178cf8a7789cb207d070b9f0502eec.tar.bz2 forums-a804c2b107178cf8a7789cb207d070b9f0502eec.tar.xz forums-a804c2b107178cf8a7789cb207d070b9f0502eec.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12816] Fix comment about logs in user_ban function
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index d11193e4b0..d39be50251 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1137,7 +1137,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas // Update log $log_entry = ($ban_exclude) ? 'LOG_BAN_EXCLUDE_' : 'LOG_BAN_'; - // Add to moderator log, admin log and user notes + // Add to admin log, moderator log and user notes add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log); add_log('mod', 0, 0, $log_entry . strtoupper($mode), $ban_reason, $ban_list_log); if ($mode == 'user') |