diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-27 16:24:21 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-27 16:24:21 +0000 |
| commit | ce4445f74a28eaee02c8d90c1a04a759cf88a9c3 (patch) | |
| tree | fc3af067265d1df62ec14ae912fa5333a535b789 /phpBB/viewtopic.php | |
| parent | b51b978854adf0e5cd902f01cd2da9f34f19429d (diff) | |
| download | forums-ce4445f74a28eaee02c8d90c1a04a759cf88a9c3.tar forums-ce4445f74a28eaee02c8d90c1a04a759cf88a9c3.tar.gz forums-ce4445f74a28eaee02c8d90c1a04a759cf88a9c3.tar.bz2 forums-ce4445f74a28eaee02c8d90c1a04a759cf88a9c3.tar.xz forums-ce4445f74a28eaee02c8d90c1a04a759cf88a9c3.zip | |
- remove description from profile fields
- added disclaimer about DEBUG_EXTRA to the ACP (i think this is needed - some idiots might think it is wise to have this enabled on a production board. :) We *may* let it there for the Betas though, but it will be removed during the RC's)
- some bugfixes
git-svn-id: file:///svn/phpbb/trunk@5973 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index f199bd888e..a4d22d3caa 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -685,20 +685,30 @@ if (!empty($topic_data['poll_start'])) { include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); $poll_bbcode = new bbcode(); + } + else + { + $poll_bbcode = false; + } - for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) + for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) + { + if ($poll_bbcode !== false) { $poll_bbcode->bbcode_second_pass($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield']); - $poll_info[$i]['poll_option_text'] = smiley_text($poll_info[$i]['poll_option_text']); - $poll_info[$i]['poll_option_text'] = str_replace("\n", '<br />', censor_text($poll_info[$i]['poll_option_text'])); } + $poll_info[$i]['poll_option_text'] = smiley_text($poll_info[$i]['poll_option_text']); + $poll_info[$i]['poll_option_text'] = str_replace("\n", '<br />', censor_text($poll_info[$i]['poll_option_text'])); + } + if ($poll_bbcode !== false) + { $poll_bbcode->bbcode_second_pass($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield']); - $poll_title = smiley_text($topic_data['poll_title']); - $poll_title = str_replace("\n", '<br />', censor_text($topic_data['poll_title'])); - - unset($poll_bbcode); } + $topic_data['poll_title'] = smiley_text($topic_data['poll_title']); + $topic_data['poll_title'] = str_replace("\n", '<br />', censor_text($topic_data['poll_title'])); + + unset($poll_bbcode); foreach ($poll_info as $poll_option) { |