diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-07-07 11:41:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-07-07 11:41:07 +0000 |
| commit | bd516916b8c627917e9be17cc81e37d56421eb66 (patch) | |
| tree | 169f8b33d7287dc559694f3b953e0dde4b026922 /phpBB/includes/bbcode.php | |
| parent | 585d533f4dc4cefc7e3e5c06cc7d9f171a81772b (diff) | |
| download | forums-bd516916b8c627917e9be17cc81e37d56421eb66.tar forums-bd516916b8c627917e9be17cc81e37d56421eb66.tar.gz forums-bd516916b8c627917e9be17cc81e37d56421eb66.tar.bz2 forums-bd516916b8c627917e9be17cc81e37d56421eb66.tar.xz forums-bd516916b8c627917e9be17cc81e37d56421eb66.zip | |
Color bbcode now supports three-digit hex notation. (Bug #39965 - Patch by leviatan21)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9722 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 562488db70..693523dcbb 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -265,7 +265,7 @@ class bbcode case 6: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( - '!\[color=(#[0-9a-f]{6}|[a-z\-]+):$uid\](.*?)\[/color:$uid\]!is' => $this->bbcode_tpl('color', $bbcode_id), + '!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+):$uid\](.*?)\[/color:$uid\]!is' => $this->bbcode_tpl('color', $bbcode_id), ) ); break; |