diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2010-02-21 11:33:29 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2010-02-21 11:33:29 +0000 |
| commit | 22621e043963dca078580eaf61b45c5022ca79e1 (patch) | |
| tree | eb18fb876a5afc0745967f29aa83c923ab524b6a /phpBB/includes/acp/acp_bbcodes.php | |
| parent | 6b99b85c8f2f366d8e5e3e2855d77b0832d141d7 (diff) | |
| download | forums-22621e043963dca078580eaf61b45c5022ca79e1.tar forums-22621e043963dca078580eaf61b45c5022ca79e1.tar.gz forums-22621e043963dca078580eaf61b45c5022ca79e1.tar.bz2 forums-22621e043963dca078580eaf61b45c5022ca79e1.tar.xz forums-22621e043963dca078580eaf61b45c5022ca79e1.zip | |
Enter stage left: the INTTEXT token
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10516 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_bbcodes.php')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 681794c972..ab042f15bf 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -315,6 +315,7 @@ class acp_bbcodes { $bbcode_match = trim($bbcode_match); $bbcode_tpl = trim($bbcode_tpl); + $utf8 = strpos($bbcode_match, 'INTTEXT') !== false; $fp_match = preg_quote($bbcode_match, '!'); $fp_replace = preg_replace('#^\[(.*?)\]#', '[$1:$uid]', $bbcode_match); @@ -342,6 +343,9 @@ class acp_bbcodes 'SIMPLETEXT' => array( '!([a-zA-Z0-9-+.,_ ]+)!' => "$1" ), + 'INTTEXT' => array( + '!([\p{L}\p{N}+-,_.\s]+)!u' => "$1" + ), 'IDENTIFIER' => array( '!([a-zA-Z0-9-_]+)!' => "$1" ), @@ -359,6 +363,7 @@ class acp_bbcodes 'EMAIL' => '(' . get_preg_expression('email') . ')', 'TEXT' => '(.*?)', 'SIMPLETEXT' => '([a-zA-Z0-9-+.,_ ]+)', + 'INTTEXT' => '([\p{L}\p{N}+-,_.\s]+)', 'IDENTIFIER' => '([a-zA-Z0-9-_]+)', 'COLOR' => '([a-zA-Z]+|#[0-9abcdefABCDEF]+)', 'NUMBER' => '([0-9]+)', @@ -366,7 +371,8 @@ class acp_bbcodes $pad = 0; $modifiers = 'i'; - + $modifiers .= ($utf8) ? 'u' : ''; + if (preg_match_all('/\{(' . implode('|', array_keys($tokens)) . ')[0-9]*\}/i', $bbcode_match, $m)) { foreach ($m[0] as $n => $token) |