diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-06-10 19:58:20 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-06-10 19:58:20 +0000 |
| commit | ef48211dc55053e1e836a394d5a5509ad64ae65b (patch) | |
| tree | 88c3211ab086331adb0e6287d527f845b62ee52f | |
| parent | c4d442f8eb29eb12393720ea9c015307c8e50989 (diff) | |
| download | forums-ef48211dc55053e1e836a394d5a5509ad64ae65b.tar forums-ef48211dc55053e1e836a394d5a5509ad64ae65b.tar.gz forums-ef48211dc55053e1e836a394d5a5509ad64ae65b.tar.bz2 forums-ef48211dc55053e1e836a394d5a5509ad64ae65b.tar.xz forums-ef48211dc55053e1e836a394d5a5509ad64ae65b.zip | |
um, oops
git-svn-id: file:///svn/phpbb/trunk@7747 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/message_parser.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 6a00aaf4e0..8b043271bc 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1538,17 +1538,19 @@ class parse_message extends bbcode_firstpass // Parse Poll Option text ;) $tmp_message = $this->message; - $tmp_bitfield = $this->bbcode_bitfield; $this->message = $poll['poll_option_text']; + $bbcode_bitfield = $this->bbcode_bitfield; $poll['poll_option_text'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false); + $this->bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield)); $this->message = $tmp_message; // Parse Poll Title $tmp_message = $this->message; $this->message = $poll['poll_title']; + $this->bbcode_bitfield = $bbcode_bitfield; $poll['poll_options'] = explode("\n", trim($poll['poll_option_text'])); $poll['poll_options_size'] = sizeof($poll['poll_options']); @@ -1570,9 +1572,9 @@ class parse_message extends bbcode_firstpass } } + $this->bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield)); $this->message = $tmp_message; - $this->bbcode_bitfield = $tmp_bitfield; - unset($tmp_message, $tmp_bitfield); + unset($tmp_message); if (sizeof($poll['poll_options']) == 1) { |