MDL-18910 full support for module intro editor with embedded images

diff --git a/mod/quiz/accessrules.php b/mod/quiz/accessrules.php
index 7d74f41b81655df22e9de4c38ead97e2fe67996f..aebcad76ed984a27d97ae916a19004e36df8f33f 100644 (file)
--- a/mod/quiz/accessrules.php
+++ b/mod/quiz/accessrules.php
@@ -621,10 +621,8 @@ class password_access_rule extends quiz_access_rule_base {
             print_header('', '', '', 'quizpassword');
         }
         if (trim(strip_tags($this->_quiz->intro))) {
-            $formatoptions = new stdClass;
-            $formatoptions->noclean = true;
-            $output .= print_box(format_text($this->_quiz->intro, $this->_quiz->introformat, $formatoptions),
-                    'generalbox', 'intro', true);
+            $cm = get_coursemodule_from_id('quiz', $this->_quiz->id);
+            $output .= print_box(format_module_intro('quiz', $this->_quiz, $cm->id), 'generalbox', 'intro', true);
         }
         $output .= print_box_start('generalbox', 'passwordbox', true);
 

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index c20d6cf7fe77ed7eef98ff99445fb92afa00a56a..4a84e29b880addfb9d47e74e3c456c23e96f3eb6 100644 (file)
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -573,6 +573,7 @@ function quiz_refresh_events($courseid = 0) {
     $moduleid = $DB->get_field('modules', 'id', array('name' => 'quiz'));
 
     foreach ($quizzes as $quiz) {
+        $cm = get_coursemodule_from_id('quiz', $quiz->id);
         $event = NULL;
         $event2 = NULL;
         $event2old = NULL;
@@ -590,7 +591,7 @@ function quiz_refresh_events($courseid = 0) {
         }
 
         $event->name        = $quiz->name;
-        $event->description = $quiz->intro;
+        $event->description = format_module_intro('quiz', $quiz, $cm->id);
         $event->courseid    = $quiz->course;
         $event->groupid     = 0;
         $event->userid      = 0;

diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index 3b8f638b4981ff364b8393ab88e8ed6051ab6e1b..5f81141e51525d56cfa89f6c8e8ccc3599c639db 100644 (file)
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -54,9 +54,7 @@ class mod_quiz_mod_form extends moodleform_mod {
         $mform->addRule('name', null, 'required', null, 'client');
 
     /// Introduction.
-        $mform->addElement('htmleditor', 'intro', get_string('introduction', 'quiz'));
-        $mform->setType('intro', PARAM_RAW);
-        $mform->setHelpButton('intro', array('richtext2', get_string('helprichtext')));
+        $this->add_intro_editor(false, get_string('introduction', 'quiz'));
 
     /// Open and close dates.
         $mform->addElement('date_time_selector', 'timeopen', get_string('quizopen', 'quiz'), array('optional' => true));

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 1412aa99996fba690d0261abc15f41034ff1ca12..bbdc88453e51f2840d24f37b0401d85478e74014 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -95,10 +95,7 @@
 /// Print quiz name and description
     print_heading(format_string($quiz->name));
     if (trim(strip_tags($quiz->intro))) {
-        $formatoptions->noclean = true;
-        $formatoptions->para    = false;
-        $formatoptions->noclean = true;
-        print_box(format_text($quiz->intro, $quiz->introformat, $formatoptions), 'generalbox', 'intro');
+        print_box(format_module_intro('quiz', $quiz, $cm->id), 'generalbox', 'intro');
     }
 
 /// Display information about this quiz.