diff options
| author | alf007 <alf007@free.fr> | 2015-05-25 00:14:48 +0200 |
|---|---|---|
| committer | alf007 <alf007@free.fr> | 2015-05-25 00:14:48 +0200 |
| commit | 6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b (patch) | |
| tree | bd40622b18c3ce4d8174f2dc717ae19a12cf3d1a /phpBB/includes/acp/acp_bbcodes.php | |
| parent | 6a4cb42565d7e1663da4d02cd8d624b034b20afe (diff) | |
| parent | 6322970766bd9fa78327fa2ca6a6a43d73b680ee (diff) | |
| download | forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.gz forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.bz2 forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.tar.xz forums-6025c40cab2d768c3cad3586fa1bfbfa6c9eeb3b.zip | |
Merge pull request #1 from phpbb/develop-ascraeus
Develop ascraeus
Diffstat (limited to 'phpBB/includes/acp/acp_bbcodes.php')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 130a3ef542..e245eea069 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -409,7 +409,9 @@ class acp_bbcodes { $bbcode_match = trim($bbcode_match); $bbcode_tpl = trim($bbcode_tpl); - $utf8 = strpos($bbcode_match, 'INTTEXT') !== false; + + // Allow unicode characters for URL|LOCAL_URL|RELATIVE_URL|INTTEXT tokens + $utf8 = preg_match('/(URL|LOCAL_URL|RELATIVE_URL|INTTEXT)/', $bbcode_match); $utf8_pcre_properties = phpbb_pcre_utf8_support(); |