MDL-51267 mod: move the changes from the API to the form file

robjoyce · Apr 19, 2016 · bc577c5 · bc577c5
1 parent f3eb995
commit bc577c5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
@@ -886,20 +886,17 @@ protected function add_intro_editor($required=null, $customlabel=null) {
      * Add an editor for an activity's introduction field.
      *
      * @param null $customlabel Override default label for editor
-     * @param array $attributes add custom attributes for the editor, it sets rows size to 10 (default) to text editor.
      * @throws coding_exception
      */
-    protected function standard_intro_elements($customlabel=null, $attributes = array()) {
+    protected function standard_intro_elements($customlabel=null) {
         global $CFG;
 
         $required = $CFG->requiremodintro;
 
         $mform = $this->_form;
         $label = is_null($customlabel) ? get_string('moduleintro') : $customlabel;
 
-        $attributes['rows'] = !empty($attributes['rows']) ? $attributes['rows'] : 10;
-
-        $mform->addElement('editor', 'introeditor', $label, $attributes, array('maxfiles' => EDITOR_UNLIMITED_FILES,
+        $mform->addElement('editor', 'introeditor', $label, array('rows' => 10), array('maxfiles' => EDITOR_UNLIMITED_FILES,
             'noclean' => true, 'context' => $this->context, 'subdirs' => true));
         $mform->setType('introeditor', PARAM_RAW); // no XSS prevention here, users must be trusted
         if ($required) {

diff --git a/mod/resource/mod_form.php b/mod/resource/mod_form.php
@@ -55,8 +55,11 @@ function definition() {
         }
         $mform->addRule('name', null, 'required', null, 'client');
         $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
-        $this->standard_intro_elements(null, array('rows' => 5));
-
+        $this->standard_intro_elements();
+        $element = $mform->getElement('introeditor');
+        $attributes = $element->getAttributes();
+        $attributes['rows'] = 5;
+        $element->setAttributes($attributes);
         $filemanager_options = array();
         $filemanager_options['accepted_types'] = '*';
         $filemanager_options['maxbytes'] = 0;

diff --git a/mod/upgrade.txt b/mod/upgrade.txt
@@ -3,8 +3,6 @@ information provided here is intended especially for developers.
 
 === 3.1 ===
 
-* A new parameter ($attributes) has been added to standard_intro_elements() on course/moodleform_mod.php. The
-  purpose of this parameter is allow developers to pass an array with custom attributes to the text editor.
 * Old /mod/MODULENAME/pix/icon.gif and enrol/paypal/pix/icon.gif GIF icons have been removed. Please use pix_icon
   renderable instead.
 * Callback get_types() is deprecated, instead activity modules can define callback get_shortcuts().

diff --git a/mod/url/mod_form.php b/mod/url/mod_form.php
@@ -48,8 +48,11 @@ function definition() {
         $mform->addElement('url', 'externalurl', get_string('externalurl', 'url'), array('size'=>'60'), array('usefilepicker'=>true));
         $mform->setType('externalurl', PARAM_RAW_TRIMMED);
         $mform->addRule('externalurl', null, 'required', null, 'client');
-        $this->standard_intro_elements(null, array('rows' => 5));
-
+        $this->standard_intro_elements();
+        $element = $mform->getElement('introeditor');
+        $attributes = $element->getAttributes();
+        $attributes['rows'] = 5;
+        $element->setAttributes($attributes);
         //-------------------------------------------------------
         $mform->addElement('header', 'optionssection', get_string('appearance'));