diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-20 22:04:14 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-20 22:04:14 +0200 |
| commit | aa8403ff027a22ab98a31175f3a0b1c349316230 (patch) | |
| tree | f330740f1e321a739f63acc407f317183d809ec4 /phpBB/includes/mcp | |
| parent | 6fb9fcd8ec5cfaf193fec7f35dde5e617c241c06 (diff) | |
| parent | 43d7d47e9bab97eb839b1c514d095d25698d1b0b (diff) | |
| download | forums-aa8403ff027a22ab98a31175f3a0b1c349316230.tar forums-aa8403ff027a22ab98a31175f3a0b1c349316230.tar.gz forums-aa8403ff027a22ab98a31175f3a0b1c349316230.tar.bz2 forums-aa8403ff027a22ab98a31175f3a0b1c349316230.tar.xz forums-aa8403ff027a22ab98a31175f3a0b1c349316230.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index fb47522644..106b025757 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -535,7 +535,7 @@ function add_warning($user_row, $warning, $send_pm = true, $post_id = 0) $message_parser = new parse_message(); - $message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning); + $message_parser->message = $user->lang('WARNING_PM_BODY', $warning); $message_parser->parse(true, true, true, false, false, true, true); $pm_data = array( @@ -553,7 +553,7 @@ function add_warning($user_row, $warning, $send_pm = true, $post_id = 0) 'address_list' => array('u' => array($user_row['user_id'] => 'to')), ); - submit_pm('post', $lang['WARNING_PM_SUBJECT'], $pm_data, false); + submit_pm('post', $user->lang('WARNING_PM_SUBJECT'), $pm_data, false); } add_log('admin', 'LOG_USER_WARNING', $user_row['username']); |