Merge branch 'MDL-32750' of git://github.com/colchambers/moodle

diff --cc lib/editor/tinymce/lib.php
index ede90a5,bf286ca..277322a
--- 1/lib/editor/tinymce/lib.php
--- 2/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.php
@@@ -274,4 -275,27 +275,23 @@@ class tinymce_texteditor extends texted
          global $CFG;
          return new moodle_url("$CFG->httpswwwroot/lib/editor/tinymce/tiny_mce/$this->version/");
      }
 -        global $CFG, $PAGE, $OUTPUT;
 -
+ 
+     /**
+      * Initialise javascript form elements
+      * @return void
+      */
+     public function initialise_collapse_js() {
 -        static $is_initialised;
 -
 -        if ($is_initialised) {
++        global $PAGE;
+         // This method is called for every editor instance. Ensure it's only run once.
+         // Static is a clunky solution but the best we could find to keep everything simple and encapsulated.
 -        $PAGE->requires->strings_for_js(array('hideeditortoolbar', 'showeditortoolbar'),
 -                'form');
 -
++        static $isinitialised;
++        if ($isinitialised) {
+             return;
+         }
+ 
+         // Initialise language strings.
 -        $is_initialised = true;
++        $PAGE->requires->strings_for_js(array('hideeditortoolbar', 'showeditortoolbar'), 'form');
+         $PAGE->requires->yui_module('moodle-editor_tinymce-collapse', 'M.editor_collapse.init');
++        $isinitialised = true;
+     }
  }

diff --cc lib/form/editor.php
index bd04b22,baf0c32..e3e23aa
--- 1/lib/form/editor.php
--- 2/lib/form/editor.php
+++ b/lib/form/editor.php
@@@ -53,7 -53,7 +53,7 @@@ class MoodleQuickForm_editor extends HT
      /** @var array options provided to initalize filepicker */
      protected $_options = array('subdirs' => 0, 'maxbytes' => 0, 'maxfiles' => 0, 'changeformat' => 0,
              'areamaxbytes' => FILE_AREA_MAX_BYTES_UNLIMITED, 'context' => null, 'noclean' => 0, 'trusttext' => 0,
-             'return_types' => 7);
 -            'return_types' => 7, 'collapsible'=>0, 'collapsed' => 0);
++            'return_types' => 7, 'collapsible' => 0, 'collapsed' => 0);
      // $_options['return_types'] = FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE
  
      /** @var array values for editor */

diff --cc question/type/edit_question_form.php
index da8ad92,270f327..f9f8872
--- 1/question/type/edit_question_form.php
--- 2/question/type/edit_question_form.php
+++ b/question/type/edit_question_form.php
@@@ -673,4 -673,8 +673,12 @@@ abstract class question_edit_form exten
       *      in the question type class.
       */
      public abstract function qtype();
 -    protected function get_non_collabsible_editor_options() {\r
 -        return array_merge($this->editoroptions, array('collapsed' => 0));\r
+ 
++    /**
++     * Returns an array of editor options with collapsed options turned off.
++     * @return array
++     */
++    protected function get_non_collabsible_editor_options() {
++        return array_merge($this->editoroptions, array('collapsed' => 0));
+     }
  }