makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15622] Rename function to avoid potential future conflicts

Browse source 
PHPBB3-15622
This commit is contained in:
MikelAlejoBR 2018-09-16 19:00:51 +02:00
parent e17f00fb6b
commit 4396bfba65
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_content.php
View file

@ -1768,7 +1768,7 @@ class bitfield
* @param parse_message $message_parser Message parser class * @param parse_message $message_parser Message parser class
* @param string $message_link Link of the original quoted post * @param string $message_link Link of the original quoted post
*/ */
function format_quote($bbcode_status, $quote_attributes, $text_formatter_utils, $message_parser, $message_link = '') function phpbb_format_quote($bbcode_status, $quote_attributes, $text_formatter_utils, $message_parser, $message_link = '')
{ {
if ($bbcode_status) if ($bbcode_status)
{ {

2
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -984,7 +984,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
$quote_attributes['post_id'] = $post['msg_id']; $quote_attributes['post_id'] = $post['msg_id'];
} }
format_quote($bbcode_status, $quote_attributes, $phpbb_container->get('text_formatter.utils'), $message_parser, $message_link); phpbb_format_quote($bbcode_status, $quote_attributes, $phpbb_container->get('text_formatter.utils'), $message_parser, $message_link);
} }
if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !$preview && !$refresh) if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !$preview && !$refresh)

2
phpBB/posting.php
View file

@ -1637,7 +1637,7 @@ if ($generate_quote)
'user_id' => $post_data['poster_id'], 'user_id' => $post_data['poster_id'],
); );
format_quote($config['allow_bbcode'], $quote_attributes, $bbcode_utils, $message_parser); phpbb_format_quote($config['allow_bbcode'], $quote_attributes, $bbcode_utils, $message_parser);
} }
if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh) if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh)