aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_bbcodes.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-08-21 15:21:25 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-08-21 15:21:25 +0200
commit4bc09cd34db4b103693c2188c79067c10b7e0b15 (patch)
treede1a34d35f711400cf6b05705611ba8d8df9d2cf /phpBB/includes/acp/acp_bbcodes.php
parent8ad58645fe87a77cbc79f25ef2aff7a3785d24eb (diff)
parentac11806bf449b1ca1b69eae023b5ec318a10547d (diff)
downloadforums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar
forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.gz
forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.bz2
forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.xz
forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.zip
Merge remote-tracking branch 'bantu/ticket/10329' into develop
* bantu/ticket/10329: [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
Diffstat (limited to 'phpBB/includes/acp/acp_bbcodes.php')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index ecbaff6274..a9574628e1 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -317,7 +317,7 @@ class acp_bbcodes
$bbcode_tpl = trim($bbcode_tpl);
$utf8 = strpos($bbcode_match, 'INTTEXT') !== false;
- $utf8_pcre_properties = pcre_utf8_support();
+ $utf8_pcre_properties = phpbb_pcre_utf8_support();
$fp_match = preg_quote($bbcode_match, '!');
$fp_replace = preg_replace('#^\[(.*?)\]#', '[$1:$uid]', $bbcode_match);