Fixed issue #16454: Sometimes, question_order is assigned from survey_id

Merge pull request #1482 from gabrieljenik/bug/16454-Sometimes,-question_order-is-assigned-from-survey_id

application/models/Question.php

@@ -250,10 +250,12 @@ public static function updateSortOrder($gid, $surveyid)
 
     /**
      * Fix sort order for questions in a group
+     * All questions in the group will be assigned a sequential question order,
+     * starting in the specified value
      * @param int $gid
-     * @param int $position
+     * @param int $startingOrder   the starting question order.
      */
-    public function updateQuestionOrder($gid, $position = 0)
+    public function updateQuestionOrder($gid, $startingOrder = 1)
     {
         $data = Yii::app()->db->createCommand()->select('qid')
             ->where(array('and', 'gid=:gid', 'parent_qid=0'))
@@ -262,7 +264,7 @@ public function updateQuestionOrder($gid, $position = 0)
             ->bindParam(':gid', $gid, PDO::PARAM_INT)
             ->query();
 
-        $position = intval($position);
+        $position = intval($startingOrder);
         foreach ($data->readAll() as $row) {
             Yii::app()->db->createCommand()->update(
                 $this->tableName(),
@@ -428,7 +430,7 @@ public function delete()
         $this->removeFromLastVisited();
 
         if (parent::delete()) {
-            Question::model()->updateQuestionOrder($this->gid, $this->sid);
+            Question::model()->updateQuestionOrder($this->gid);
             return true;
         }
         return false;