Fixed issue #18051: RemoteControl API: Deleting a question crashes (#…

…2377) Dev: use same function then 5.x Dev: thanks chris1337
LimeSurvey · May 6, 2022 · 14abf65 · 14abf65
1 parent d1983da
commit 14abf65
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/application/helpers/remotecontrol/remotecontrol_handle.php b/application/helpers/remotecontrol/remotecontrol_handle.php
@@ -1325,7 +1325,7 @@ public function delete_question($sSessionKey, $iQuestionID)
             $iQuestionID = (int) $iQuestionID;
             $oQuestion = Question::model()->findByAttributes(array('qid' => $iQuestionID));
             if (!isset($oQuestion)) {
-                            return array('status' => 'Error: Invalid question ID');
+                return array('status' => 'Error: Invalid question ID');
             }
 
             $iSurveyID = $oQuestion['sid'];
@@ -1334,13 +1334,13 @@ public function delete_question($sSessionKey, $iQuestionID)
                 $oSurvey = Survey::model()->findByPk($iSurveyID);
 
                 if ($oSurvey['active'] == 'Y') {
-                                    return array('status' => 'Survey is active and not editable');
+                    return array('status' => 'Survey is active and not editable');
                 }
                 $iGroupID = $oQuestion['gid'];
 
                 $oCondition = Condition::model()->findAllByAttributes(array('cqid' => $iQuestionID));
                 if (count($oCondition) > 0) {
-                                return array('status' => 'Cannot delete Question. Others rely on this question');
+                    return array('status' => 'Cannot delete Question. Others rely on this question');
                 }
 
                 LimeExpressionManager::RevertUpgradeConditionsToRelevance(null, $iQuestionID);
@@ -1357,18 +1357,18 @@ public function delete_question($sSessionKey, $iQuestionID)
 
                     DefaultValue::model()->deleteAllByAttributes(array('qid' => $iQuestionID));
                     QuotaMember::model()->deleteAllByAttributes(array('qid' => $iQuestionID));
-                    Question::updateQuestionOrder($iGroupID);
+                    Question::updateSortOrder($iGroupID, $iSurveyID);
 
                     return (int) $iQuestionID;
                 } catch (Exception $e) {
                     return array('status' => 'Error');
                 }
 
             } else {
-                            return array('status' => 'No permission');
+                return array('status' => 'No permission');
             }
         } else {
-                    return array('status' => 'Invalid session key');
+            return array('status' => 'Invalid session key');
         }
     }