aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-09-14 16:47:46 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-09-14 16:47:46 +0200
commit20460dc12c04a8d946acd54816c220595aa83214 (patch)
tree019b12edba79ab0be7d0fb9e96bdf3f827888694
parentb4b3efa45b11d7df37b1fe2a5b4fad3b5b59dbe1 (diff)
parenta81c857c96ee1a2a9be559ff3c9b71ca9514287e (diff)
downloadforums-20460dc12c04a8d946acd54816c220595aa83214.tar
forums-20460dc12c04a8d946acd54816c220595aa83214.tar.gz
forums-20460dc12c04a8d946acd54816c220595aa83214.tar.bz2
forums-20460dc12c04a8d946acd54816c220595aa83214.tar.xz
forums-20460dc12c04a8d946acd54816c220595aa83214.zip
Merge branch 'ticket/nickvergessen/9162' into develop-olympus
* ticket/nickvergessen/9162: [ticket/9162] BBCode in poll options is broken, when posting without question.
-rw-r--r--phpBB/posting.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index a793159a2d..853ac18aad 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1300,7 +1300,7 @@ $attachment_data = $message_parser->attachment_data;
$filename_data = $message_parser->filename_data;
$post_data['post_text'] = $message_parser->message;
-if (sizeof($post_data['poll_options']) && $post_data['poll_title'])
+if (sizeof($post_data['poll_options']) || $post_data['poll_title'])
{
$message_parser->message = $post_data['poll_title'];
$message_parser->bbcode_uid = $post_data['bbcode_uid'];