diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-05-19 23:53:27 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-05-19 23:53:27 +0200 |
| commit | 9ccc7f4d656ef333475fa0a39dfe4eda897573ca (patch) | |
| tree | cc1f6a712b761e1e843887454b0ca6732dfe7f9a /phpBB/includes/acp | |
| parent | 5e6c026527077f2ea57311cfd7ca2abce331ae0b (diff) | |
| parent | f31483242bcafb47cd64150c242bd273ba16f7dd (diff) | |
| download | forums-9ccc7f4d656ef333475fa0a39dfe4eda897573ca.tar forums-9ccc7f4d656ef333475fa0a39dfe4eda897573ca.tar.gz forums-9ccc7f4d656ef333475fa0a39dfe4eda897573ca.tar.bz2 forums-9ccc7f4d656ef333475fa0a39dfe4eda897573ca.tar.xz forums-9ccc7f4d656ef333475fa0a39dfe4eda897573ca.zip | |
Merge pull request #3597 from s9e/ticket/13614
[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index d451b4d899..2b438e5670 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -416,8 +416,6 @@ class acp_bbcodes // 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(); - $fp_match = preg_quote($bbcode_match, '!'); $fp_replace = preg_replace('#^\[(.*?)\]#', '[$1:$uid]', $bbcode_match); $fp_replace = preg_replace('#\[/(.*?)\]$#', '[/$1:$uid]', $fp_replace); @@ -448,7 +446,7 @@ class acp_bbcodes '!([a-zA-Z0-9-+.,_ ]+)!' => "$1" ), 'INTTEXT' => array( - ($utf8_pcre_properties) ? '!([\p{L}\p{N}\-+,_. ]+)!u' : '!([a-zA-Z0-9\-+,_. ]+)!u' => "$1" + '!([\p{L}\p{N}\-+,_. ]+)!u' => "$1" ), 'IDENTIFIER' => array( '!([a-zA-Z0-9-_]+)!' => "$1" @@ -468,7 +466,7 @@ class acp_bbcodes 'EMAIL' => '(' . get_preg_expression('email') . ')', 'TEXT' => '(.*?)', 'SIMPLETEXT' => '([a-zA-Z0-9-+.,_ ]+)', - 'INTTEXT' => ($utf8_pcre_properties) ? '([\p{L}\p{N}\-+,_. ]+)' : '([a-zA-Z0-9\-+,_. ]+)', + 'INTTEXT' => '([\p{L}\p{N}\-+,_. ]+)', 'IDENTIFIER' => '([a-zA-Z0-9-_]+)', 'COLOR' => '([a-zA-Z]+|#[0-9abcdefABCDEF]+)', 'NUMBER' => '([0-9]+)', @@ -476,7 +474,7 @@ class acp_bbcodes $pad = 0; $modifiers = 'i'; - $modifiers .= ($utf8 && $utf8_pcre_properties) ? 'u' : ''; + $modifiers .= ($utf8) ? 'u' : ''; if (preg_match_all('/\{(' . implode('|', array_keys($tokens)) . ')[0-9]*\}/i', $bbcode_match, $m)) { |