Merge branch 'MDL-29176_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

2011-12-19 12:23:36 +13:00
parent 3bcb2c1dff 98402da094
commit ead158db7e
1 changed files with 9 additions and 1 deletions
@@ -356,11 +356,19 @@ if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {
        //move to the end of the selected page
        $pagebreakpositions = array_keys($questions, 0);
        $numpages = count($pagebreakpositions);
+
        // Ensure the target page number is in range.
-        $moveselectedonpage = max(1, min($moveselectedonpage, $pagebreakpositions));
+        for ($i = $moveselectedonpage; $i > $numpages; $i--) {
+            $questions[] = 0;
+            $pagebreakpositions[] = count($questions) - 1;
+        }
        $moveselectedpos = $pagebreakpositions[$moveselectedonpage - 1];
+
+        // Do the move.
        array_splice($questions, $moveselectedpos, 0, $selectedquestionids);
        $quiz->questions = implode(',', $questions);
+
+        // Update the database.
        $DB->set_field('quiz', 'questions', $quiz->questions, array('id' => $quiz->id));
        $deletepreviews = true;
    }