merged fix for MDL-8688, question pics should default to ''

diff --git a/question/type/edit_question_form.php b/question/type/edit_question_form.php
index b02b322bca4da3f37a3bfaf5e51ca2accec92dbd..04d74e0e8016c7f0ebfe680361d4f7957131dcb1 100644 (file)
--- a/question/type/edit_question_form.php
+++ b/question/type/edit_question_form.php
@@ -70,8 +70,7 @@ class question_edit_form extends moodleform {
         if (empty($images)) {
             $mform->addElement('static', 'image', get_string('imagedisplay', 'quiz'), get_string('noimagesyet'));
         } else {
-            $images[''] = get_string('none');
-            $mform->addElement('select', 'image', get_string('imagedisplay', 'quiz'), $images);
+            $mform->addElement('select', 'image', get_string('imagedisplay', 'quiz'), array_merge(array(''=>get_string('none')), $images));
         }
 
         $mform->addElement('text', 'defaultgrade', get_string('defaultgrade', 'quiz'),