From df041a6fc23a4b8352dceff21049dd3ed4e25dc9 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 7 Jun 2003 17:52:31 +0000
Subject: [PATCH] see changelog entry

git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@4096 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/docs/CHANGELOG.html | 1 +
 phpBB/posting.php         | 4 ++++
 phpBB/viewtopic.php       | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index a93c3bc48f..6b69f086c0 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -116,6 +116,7 @@ p,ul,td {font-size:10pt;}
 <li>Prevent registration if user is logged in or user trying to register a second time</li>
 <li>Prevent usage of ALT-255 in Usernames</li>
 <li>Fixed IP retrieval for users with two proxy setups while the first proxy is hiding the clients IP Address - <b>cosmos</b></li>
+<li>If user votes in poll without selecting an option, he will be redirected to the topic.</li>
 </ul>
 
 <a name="203"></a><h3 class="h3">1.ii. Changes since 2.0.3</h3>
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 8359f365a4..87a320b1a2 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -512,6 +512,10 @@ else if ( $mode == 'vote' )
 		$message .=  '<br /><br />' . sprintf($lang['Click_view_message'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
 		message_die(GENERAL_MESSAGE, $message);
 	}
+	else
+	{
+		redirect(append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
+	}
 }
 else if ( $submit || $confirm )
 {
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 8c5b74b80a..e1cea49b0d 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -792,7 +792,7 @@ if ( !empty($forum_topic_data['topic_vote']) )
 			$vote_title = preg_replace($orig_word, $replacement_word, $vote_title);
 		}
 
-		$s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
+		$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
 
 		$template->assign_vars(array(
 			'POLL_QUESTION' => $vote_title,