diff options
author | MikelAlejoBR <mikelalejobr@outlook.com> | 2018-09-16 19:00:51 +0200 |
---|---|---|
committer | MikelAlejoBR <mikelalejobr@outlook.com> | 2018-09-16 19:23:30 +0200 |
commit | 4396bfba65b0c69023b47b564f789700f892e05a (patch) | |
tree | 14a72e342c3ae592abf91e45903b11a66c95f843 /phpBB/includes | |
parent | e17f00fb6b482c71f3ed42786b6f413373a61b9b (diff) | |
download | forums-4396bfba65b0c69023b47b564f789700f892e05a.tar forums-4396bfba65b0c69023b47b564f789700f892e05a.tar.gz forums-4396bfba65b0c69023b47b564f789700f892e05a.tar.bz2 forums-4396bfba65b0c69023b47b564f789700f892e05a.tar.xz forums-4396bfba65b0c69023b47b564f789700f892e05a.zip |
[ticket/15622] Rename function to avoid potential future conflicts
PHPBB3-15622
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/functions_content.php | 2 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index ed35f5213f..e124bd46e6 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1768,7 +1768,7 @@ class bitfield * @param parse_message $message_parser Message parser class * @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) { diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index d201c5fe73..ca2d3257e6 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -984,7 +984,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $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) |