aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-20 22:03:50 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-20 22:03:50 +0200
commit43d7d47e9bab97eb839b1c514d095d25698d1b0b (patch)
tree508630858fb98696ce63aa89511be1175f6373eb
parent0f3defbb262c0b1441b215311ad9f246a820a963 (diff)
parent9486c693b649f4e7e412dd5c8cf9c247507a7f29 (diff)
downloadforums-43d7d47e9bab97eb839b1c514d095d25698d1b0b.tar
forums-43d7d47e9bab97eb839b1c514d095d25698d1b0b.tar.gz
forums-43d7d47e9bab97eb839b1c514d095d25698d1b0b.tar.bz2
forums-43d7d47e9bab97eb839b1c514d095d25698d1b0b.tar.xz
forums-43d7d47e9bab97eb839b1c514d095d25698d1b0b.zip
Merge pull request #2895 from Nicofuma/ticket/12998
[ticket/12998] Fix use of $lang in mcp_warn.php
-rw-r--r--phpBB/includes/mcp/mcp_warn.php4
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']);