Merge branch 'MDL-29176_21' of git://github.com/timhunt/moodle into M…

…OODLE_21_STABLE

mod/quiz/edit.php

@@ -356,11 +356,19 @@ function module_specific_controls($totalnumber, $recurse, $category, $cmid, $cmo
         //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;
     }