MDL-16676 All references to the text.html and emoticons.html files need to be updated...

diff --git a/admin/uploaduser_form.php b/admin/uploaduser_form.php
index 79559a68cb6a9eadf7af14fff54dcd7b93e44c5f..3a2cb8402765b9a8d122f0884d981937a29269d9 100644 (file)
--- a/admin/uploaduser_form.php
+++ b/admin/uploaduser_form.php
@@ -212,7 +212,7 @@ class admin_uploaduser_form2 extends moodleform {
 
         $mform->addElement('htmleditor', 'description', get_string('userdescription'));
         $mform->setType('description', PARAM_CLEAN);
-        $mform->setHelpButton('description', array('text', get_string('helptext')));
+        $mform->setHelpButton('description', array('text2', get_string('helptext')));
         $mform->setAdvanced('description');
 
         $mform->addElement('text', 'url', get_string('webpage'), 'maxlength="255" size="50"');

diff --git a/course/edit_form.php b/course/edit_form.php
index b9e78aff5155ad940b7ab3b40bf2e7e8e3c32eab..d72f72cf71e4e1282b84fd4a7eaf0f6dad55bdbc 100644 (file)
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -100,7 +100,7 @@ class course_edit_form extends moodleform {
         $mform->setType('idnumber', PARAM_RAW);
 
         $mform->addElement('htmleditor','summary', get_string('summary'), array('rows'=> '10', 'cols'=>'65'));
-        $mform->setHelpButton('summary', array('text', get_string('helptext')), true);
+        $mform->setHelpButton('summary', array('text2', get_string('helptext')), true);
         $mform->setType('summary', PARAM_RAW);
 
         $courseformats = get_list_of_plugins('course/format');

diff --git a/course/request_form.php b/course/request_form.php
index 3654969ff36ba161a6c1f637eb81b6f63c36e9d7..a7637ac3a1a17b9eb310302bdded3b0f8b08616f 100644 (file)
--- a/course/request_form.php
+++ b/course/request_form.php
@@ -17,7 +17,7 @@ class course_request_form extends moodleform {
         $mform->addElement('htmleditor', 'summary', get_string('summary'), array('rows'=>'15', 'cols'=>'50'));
         $mform->addRule('summary', get_string('missingsummary'), 'required', null, 'client');
         $mform->setType('summary', PARAM_RAW);
-        $mform->setHelpButton('summary', array('text', get_string('helptext')));
+        $mform->setHelpButton('summary', array('text2', get_string('helptext')));
 
 
         $mform->addElement('textarea', 'reason', get_string('courserequestreason'), array('rows'=>'15', 'cols'=>'50'));

diff --git a/lib/form/editorhelp.php b/lib/form/editorhelp.php
index 4b8e9167c0a226ccd553caf61dcafd3b4bde54ac..a4cc3b71a1fde54d934edc360acb99bcf8ae73c6 100644 (file)
--- a/lib/form/editorhelp.php
+++ b/lib/form/editorhelp.php
@@ -16,13 +16,13 @@ for ($i=1; ; $i++){
                 $topics[$i] = helplink('questions', get_string('helpquestions'));
                 break;
             case 'emoticons' :
-                $topics[$i] = helplink('emoticons', get_string('helpemoticons'));
+                $topics[$i] = helplink('emoticons2', get_string('helpemoticons'));
                 break;
             case 'richtext' :
-                $topics[$i] = helplink('richtext', get_string('helprichtext'));
+                $topics[$i] = helplink('richtext2', get_string('helprichtext'));
                 break;
             case 'text' :
-                $topics[$i] = helplink('text', get_string('helptext'));
+                $topics[$i] = helplink('text2', get_string('helptext'));
                 break;
             default :
                 print_error('unknownhelp', '', '', $item);

diff --git a/lib/form/htmleditor.php b/lib/form/htmleditor.php
index f92855eaf86e77eea4931ebe0975583fa0d5b904..0eea8397deaba4b63f48d447b394490a556bd7a8 100644 (file)
--- a/lib/form/htmleditor.php
+++ b/lib/form/htmleditor.php
@@ -47,11 +47,11 @@ class MoodleQuickForm_htmleditor extends MoodleQuickForm_textarea{
     function setHelpButton($helpbuttonargs, $function='helpbutton'){
         if (!$this->_canUseHtmlEditor){
             if ('editorhelpbutton' == $function){
-                $key = array_search('richtext', $helpbuttonargs);
+                $key = array_search('richtext2', $helpbuttonargs);
                 if ($key !== FALSE){
                     array_splice($helpbuttonargs, $key, 1, array('text', 'emoticons'));
                 }
-            } elseif ('helpbutton' == $function && $helpbuttonargs[0] == 'richtext' && ((!isset($helpbuttonargs[2])) || $helpbuttonargs[2] == 'moodle')){
+            } elseif ('helpbutton' == $function && $helpbuttonargs[0] == 'richtext2' && ((!isset($helpbuttonargs[2])) || $helpbuttonargs[2] == 'moodle')){
                 //replace single 'richtext' help button with text and emoticon button when htmleditor off.
                 return $this->setHelpButton(array('text', 'emoticons'), 'editorhelpbutton');
             }

diff --git a/user/editlib.php b/user/editlib.php
index 45e975e52cc2c918937a5c3077463eb457cc5352..c9c1a596fc715b3d1a149b1196d228b4ac618e61 100644 (file)
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -230,7 +230,7 @@ function useredit_shared_definition(&$mform) {
 
     $mform->addElement('htmleditor', 'description', get_string('userdescription'));
     $mform->setType('description', PARAM_CLEAN);
-    $mform->setHelpButton('description', array('text', get_string('helptext')));
+    $mform->setHelpButton('description', array('text2', get_string('helptext')));
 
     if (!empty($CFG->gdversion)) {
         $mform->addElement('header', 'moodle_picture', get_string('pictureof'));//TODO: Accessibility fix fieldset legend

diff --git a/user/profile/definelib.php b/user/profile/definelib.php
index afd0791fcddbb32bca0f8295f250739007cc6fd4..f94749d77ed5c624dad0800f695ef61c0c3d41fc 100644 (file)
--- a/user/profile/definelib.php
+++ b/user/profile/definelib.php
@@ -32,7 +32,7 @@ class profile_define_base {
         $form->setType('name', PARAM_MULTILANG);
 
         $form->addElement('htmleditor', 'description', get_string('profiledescription', 'admin'));
-        $form->setHelpButton('description', array('text', get_string('helptext')));
+        $form->setHelpButton('description', array('text2', get_string('helptext')));
 
         $form->addElement('selectyesno', 'required', get_string('profilerequired', 'admin'));