Merged inheritance fix from stable

diff --git a/question/type/essay/questiontype.php b/question/type/essay/questiontype.php
index 1dcbeb41ec260dcd4f23addcb056f32f05943ec5..b92c3443cb90bbba4e9f7505855a9f039525e61a 100644 (file)
--- a/question/type/essay/questiontype.php
+++ b/question/type/essay/questiontype.php
@@ -115,6 +115,10 @@ class question_essay_qtype extends default_questiontype {
         return true;
     }
 
+    function display_question_editing_page(&$mform, $question, $wizardnow){
+        parent:: display_question_editing_page($mform, $question, $wizardnow);
+    }
+
     /**
      * Backup the extra information specific to an essay question - over and above
      * what is in the mdl_question table.