fix optionController

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/Controller/OptionController.php b/lib/Controller/OptionController.php
index d256a1f9..9180d1a0 100644
--- a/lib/Controller/OptionController.php
+++ b/lib/Controller/OptionController.php
@@ -149,7 +149,11 @@ class OptionController extends Controller {
 			$NewOption->setPollId($option['pollId']);
 			$NewOption->setPollOptionText(trim(htmlspecialchars($option['pollOptionText'])));
 			$NewOption->setTimestamp($option['timestamp']);
-			$NewOption->setOrder($option['timestamp'], $option['order']);
+			if ($option['timestamp']) {
+				$NewOption->setOrder($option['timestamp']);
+			} else {
+				$NewOption->setOrder($option['order']);
+			}
 
 			$this->optionMapper->insert($NewOption);
 			$this->logService->setLog($option['pollId'], 'addOption');
@@ -186,8 +190,6 @@ class OptionController extends Controller {
 				$updateOption->setOrder($option['order']);
 			}
 
-
-
 			if ($option['confirmed']) {
 				// do not update confirmation date, if option is already confirmed
 				if (!$updateOption->getConfirmed()){