diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-20 17:31:24 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-20 17:31:24 +0100 |
| commit | 2dcce578067c9765c8a86487977ea559da8fc8a6 (patch) | |
| tree | e02be5543c3b92a760cf572b1fcbc39af77bb0d0 /phpBB/includes/acp/acp_bbcodes.php | |
| parent | 2535e9da0084d9af553ad5df93eb60865950492d (diff) | |
| parent | d99cd2d02ea8e5458ba5527bb1264497fe77ef18 (diff) | |
| download | forums-2dcce578067c9765c8a86487977ea559da8fc8a6.tar forums-2dcce578067c9765c8a86487977ea559da8fc8a6.tar.gz forums-2dcce578067c9765c8a86487977ea559da8fc8a6.tar.bz2 forums-2dcce578067c9765c8a86487977ea559da8fc8a6.tar.xz forums-2dcce578067c9765c8a86487977ea559da8fc8a6.zip | |
Merge branch 'develop-ascraeus' into develop
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(); |