From 1f906b431b3a1b45a442545544d0b72dc7356af4 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Fri, 24 Jul 2020 08:11:05 +0200
Subject: Code maintenance

---
 lib/Service/OptionService.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/Service/OptionService.php b/lib/Service/OptionService.php
index 84fb9822..3cabc5ae 100644
--- a/lib/Service/OptionService.php
+++ b/lib/Service/OptionService.php
@@ -285,14 +285,7 @@ class OptionService {
 
 		foreach ($this->optionMapper->findByPoll($pollId) as $option) {
 			$currentOrder = $option->getOrder();
-			if (
-				   ($currentOrder < $oldOrder && $currentOrder < $newOrder)
-				|| ($currentOrder > $oldOrder && $currentOrder > $newOrder)
-			) {
-
-				continue;
-
-			} elseif ($currentOrder > $oldOrder && $currentOrder <= $newOrder) {
+			if ($currentOrder > $oldOrder && $currentOrder <= $newOrder) {
 
 				$option->setOrder($currentOrder - 1);
 				$this->optionMapper->update($option);
@@ -310,6 +303,8 @@ class OptionService {
 				$option->setOrder($newOrder);
 				$this->optionMapper->update($option);
 
+			} else {
+				continue;
 			}
 		}
 
-- 
cgit v1.2.3