aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/bbcode.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2010-02-21 11:35:45 +0000
committerHenry Sudhof <kellanved@phpbb.com>2010-02-21 11:35:45 +0000
commit9aa4a822efac6763c0de22d5d62fe7e6b3c9c31a (patch)
tree9c77fbc3b7155f096eeeac6e768964e0e9f642fa /phpBB/includes/bbcode.php
parentaa2d9e6765f39e5037f3514b80ff90833aac4c9b (diff)
downloadforums-9aa4a822efac6763c0de22d5d62fe7e6b3c9c31a.tar
forums-9aa4a822efac6763c0de22d5d62fe7e6b3c9c31a.tar.gz
forums-9aa4a822efac6763c0de22d5d62fe7e6b3c9c31a.tar.bz2
forums-9aa4a822efac6763c0de22d5d62fe7e6b3c9c31a.tar.xz
forums-9aa4a822efac6763c0de22d5d62fe7e6b3c9c31a.zip
Enter stage left: the INTTEXT token (merge)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
-rw-r--r--phpBB/includes/bbcode.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index f58852c00b..304191e38d 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -360,7 +360,7 @@ class bbcode
// In order to use templates with custom bbcodes we need
// to replace all {VARS} to corresponding backreferences
// Note that backreferences are numbered from bbcode_match
- if (preg_match_all('/\{(URL|LOCAL_URL|EMAIL|TEXT|SIMPLETEXT|IDENTIFIER|COLOR|NUMBER)[0-9]*\}/', $rowset[$bbcode_id]['bbcode_match'], $m))
+ if (preg_match_all('/\{(URL|LOCAL_URL|EMAIL|TEXT|SIMPLETEXT|INTTEXT|IDENTIFIER|COLOR|NUMBER)[0-9]*\}/', $rowset[$bbcode_id]['bbcode_match'], $m))
{
foreach ($m[0] as $i => $tok)
{