MDL-19002 standardized constructor parameter order

diff --git a/course/editsection_form.php b/course/editsection_form.php
index 99ce5d0325c172c36d91fd59d9617e966b9d71ed..ef825af0ad625b8c24ca1ed00ea15b010a029c9e 100644 (file)
--- a/course/editsection_form.php
+++ b/course/editsection_form.php
@@ -10,7 +10,7 @@ class editsection_form extends moodleform {
         $mform  = $this->_form;
         $course = $this->_customdata;
 
-        $mform->addElement('editor', 'summary', get_string('summary'), array('changeformat'=>false, 'maxfiles'=>-1));
+        $mform->addElement('editor', 'summary', get_string('summary'), null, array('changeformat'=>false, 'maxfiles'=>-1));
 
         $mform->addElement('hidden', 'id');
         $mform->setType('id', PARAM_INT);

diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index bb763864d6dd5d0085dcfb0ecbbde5329f5b80a3..427a1c611a4c24d7cd30feda42ad48a6ea6f33f9 100644 (file)
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -581,7 +581,7 @@ class moodleform_mod extends moodleform {
         $mform = $this->_form;
         $label = is_null($customlabel) ? get_string('moduleintro') : $customlabel;
 
-        $mform->addElement('editor', 'introeditor', $label, array('maxfiles'=>EDITOR_UNLIMITED_FILES));
+        $mform->addElement('editor', 'introeditor', $label, null, array('maxfiles'=>EDITOR_UNLIMITED_FILES));
         $mform->setType('introeditor', PARAM_RAW); // no XSS prevention here, users must be trusted
         if ($required) {
             $mform->addRule('introeditor', get_string('required'), 'required', null, 'client');

diff --git a/lib/form/editor.php b/lib/form/editor.php
index b0eabac6aaa870cc7fddbf662340cadd149a15bf..287d52934f54b38263e0b5c4039b610658869263 100644 (file)
--- a/lib/form/editor.php
+++ b/lib/form/editor.php
@@ -14,7 +14,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
     protected $_options    = array('subdirs'=>0, 'maxbytes'=>0, 'maxfiles'=>0, 'changeformat'=>0);
     protected $_values     = array('text'=>null, 'format'=>null, 'itemid'=>null);
 
-    function MoodleQuickForm_editor($elementName=null, $elementLabel=null, $options=null, $attributes=null) {
+    function MoodleQuickForm_editor($elementName=null, $elementLabel=null, $attributes=null, $options=null) {
         global $CFG;
 
         $options = (array)$options;

diff --git a/mod/forum/post_form.php b/mod/forum/post_form.php
index 244066b9a3f875334d31d3eef6773bcca0308367..6ee86b2f90b5c81bdfbf50fd6c7caee6687cf97d 100644 (file)
--- a/mod/forum/post_form.php
+++ b/mod/forum/post_form.php
@@ -23,7 +23,7 @@ class mod_forum_post_form extends moodleform {
         $mform->addRule('subject', get_string('required'), 'required', null, 'client');
         $mform->addRule('subject', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
 
-        $mform->addElement('editor', 'message', get_string('message', 'forum'), array('maxfiles' => EDITOR_UNLIMITED_FILES));
+        $mform->addElement('editor', 'message', get_string('message', 'forum'), null, array('maxfiles' => EDITOR_UNLIMITED_FILES));
         $mform->setType('message', PARAM_RAW);
         $mform->addRule('message', get_string('required'), 'required', null, 'client');
         $mform->setHelpButton('message', array('reading', 'writing', 'questions', 'richtext2'), false, 'editorhelpbutton');

diff --git a/mod/glossary/comment_form.php b/mod/glossary/comment_form.php
index d576f0efd1abdffd4541cf7e17c7d70714e8782d..30c52f2e9e1f1cb36e852ff20ef447347c2af31e 100644 (file)
--- a/mod/glossary/comment_form.php
+++ b/mod/glossary/comment_form.php
@@ -10,7 +10,7 @@ class mod_glossary_comment_form extends moodleform {
         $commentoptions = $this->_customdata['commentoptions'];
         
         // visible elements
-        $mform->addElement('editor', 'entrycomment_editor', get_string('comment', 'glossary'), $commentoptions);
+        $mform->addElement('editor', 'entrycomment_editor', get_string('comment', 'glossary'), null, $commentoptions);
         $mform->addRule('entrycomment_editor', get_string('required'), 'required', null, 'client');
         $mform->setType('entrycomment_editor', PARAM_RAW); // processed by trust text or cleaned before the display
 

diff --git a/mod/glossary/edit_form.php b/mod/glossary/edit_form.php
index de29588385cb2100b2de2bd67e2e0c9a09224aba..d0767f7d28ae473acca14fa19483f61d27141833 100644 (file)
--- a/mod/glossary/edit_form.php
+++ b/mod/glossary/edit_form.php
@@ -21,7 +21,7 @@ class mod_glossary_entry_form extends moodleform {
         $mform->setType('concept', PARAM_TEXT);
         $mform->addRule('concept', null, 'required', null, 'client');
 
-        $mform->addElement('editor', 'definition_editor', get_string('definition', 'glossary'), $definitionoptions);
+        $mform->addElement('editor', 'definition_editor', get_string('definition', 'glossary'), null, $definitionoptions);
         $mform->setType('definition_editor', PARAM_RAW);
         $mform->addRule('definition_editor', get_string('required'), 'required', null, 'client');