diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-12-22 17:31:30 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-12-22 17:31:30 +0100 |
| commit | 70a56c208fa5bcdde9337c871b30aaaf7e5602b8 (patch) | |
| tree | c0fb49e28e52ec719fade6f7944554d0b4f09602 /phpBB/includes/functions_content.php | |
| parent | 73fd2f357323bc3690ce15be23a54ef1896f87fa (diff) | |
| parent | b089116965c361b02106fb839877f33639982a42 (diff) | |
| download | forums-70a56c208fa5bcdde9337c871b30aaaf7e5602b8.tar forums-70a56c208fa5bcdde9337c871b30aaaf7e5602b8.tar.gz forums-70a56c208fa5bcdde9337c871b30aaaf7e5602b8.tar.bz2 forums-70a56c208fa5bcdde9337c871b30aaaf7e5602b8.tar.xz forums-70a56c208fa5bcdde9337c871b30aaaf7e5602b8.zip | |
Merge branch 'prep-release-3.2.5' into 3.2.x
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 8284aab6a4..a15a03f966 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1762,13 +1762,14 @@ class bitfield /** * Formats the quote according to the given BBCode status setting * - * @param bool $bbcode_status The status of the BBCode setting - * @param array $quote_attributes The attributes of the quoted post - * @param phpbb\textformatter\utils $text_formatter_utils Text formatter utilities - * @param parse_message $message_parser Message parser class - * @param string $message_link Link of the original quoted post + * @param phpbb\language\language $language Language class + * @param parse_message $message_parser Message parser class + * @param phpbb\textformatter\utils_interface $text_formatter_utils Text formatter utilities + * @param bool $bbcode_status The status of the BBCode setting + * @param array $quote_attributes The attributes of the quoted post + * @param string $message_link Link of the original quoted post */ -function phpbb_format_quote($bbcode_status, $quote_attributes, $text_formatter_utils, $message_parser, $message_link = '') +function phpbb_format_quote($language, $message_parser, $text_formatter_utils, $bbcode_status, $quote_attributes, $message_link = '') { if ($bbcode_status) { @@ -1794,7 +1795,7 @@ function phpbb_format_quote($bbcode_status, $quote_attributes, $text_formatter_u $message = $quote_string . $message; $message = str_replace("\n", "\n" . $quote_string, $message); - $message_parser->message = $quote_attributes['author'] . " " . $user->lang['WROTE'] . ":\n" . $message . "\n"; + $message_parser->message = $quote_attributes['author'] . " " . $language->lang('WROTE') . ":\n" . $message . "\n"; } if ($message_link) |