From 24c7edaeeb4106ca8bae3b2116178b6c008c4927 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 4 Aug 2013 14:47:19 +0200
Subject: [PATCH] Fixes poll option issues

---
 com.woltlab.wcf/templates/__messageFormPoll.tpl | 2 +-
 wcfsetup/install/files/js/WCF.Poll.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl
index 8c808770d3..d012ddbbbe 100644
--- a/com.woltlab.wcf/templates/__messageFormPoll.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl
@@ -8,7 +8,7 @@
 				'wcf.poll.button.removeOption': '{lang}wcf.poll.button.removeOption{/lang}'
 			});
 			
-			new WCF.Poll.Management('pollOptionContainer', [ {implode from=$pollOptions item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{$pollOption[optionValue]}' }{/implode} ], {@POLL_MAX_OPTIONS});
+			new WCF.Poll.Management('pollOptionContainer', [ {implode from=$pollOptions item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{$pollOption[optionValue]|encodeJS}' }{/implode} ], {@POLL_MAX_OPTIONS});
 		});
 		//]]>
 	</script>
diff --git a/wcfsetup/install/files/js/WCF.Poll.js b/wcfsetup/install/files/js/WCF.Poll.js
index 14d2983ef3..9ee763ae3a 100644
--- a/wcfsetup/install/files/js/WCF.Poll.js
+++ b/wcfsetup/install/files/js/WCF.Poll.js
@@ -226,7 +226,7 @@ WCF.Poll.Management = Class.extend({
 			
 			for (var $i = 0, $length = $options.length; $i < $length; $i++) {
 				var $option = $options[$i];
-				$('<input type="hidden" name="pollOptions[' + $i + ']" value="' + $option.optionID + '_' + $option.optionValue + '" />').appendTo($formSubmit);
+				$('<input type="hidden" name="pollOptions[' + $i + ']" />').val($option.optionID + '_' + $option.optionValue).appendTo($formSubmit);
 			}
 		}
 	}
-- 
2.20.1