MDL-14635 fix user profil help icons, merged from 19

diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index d9985a66965f52d2ac8a0a1a350a8c9285c7cc36..e0c9123f63b089b42facf3cbdb9687dee53b4de9 100644 (file)
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -35,14 +35,11 @@ class user_editadvanced_form extends moodleform {
         $mform->setAdvanced('auth');
 
         $mform->addElement('passwordunmask', 'newpassword', get_string('newpassword'), 'size="20"');
-        $mform->setHelpButton('newpassword', array(false, get_string('leavetokeep'),
-                          false, true, false, get_string('leavetokeep')));
+        $mform->setHelpButton('newpassword',array('newpassword', get_string('leavetokeep')));
         $mform->setType('newpassword', PARAM_RAW);
 
         $mform->addElement('advcheckbox', 'preference_auth_forcepasswordchange', get_string('forcepasswordchange'));
-        $mform->setHelpButton('preference_auth_forcepasswordchange', array(false, get_string('forcepasswordchangehelp'),
-                          false, true, false, get_string('forcepasswordchangehelp')));
-
+        $mform->setHelpButton('preference_auth_forcepasswordchange',array('forcepasswordchange', get_string('forcepasswordchange')));
         /// shared fields
         useredit_shared_definition($mform);
 

diff --git a/user/editlib.php b/user/editlib.php
index fd4d8bf74c82ca553ee4a2f1cda1630e445dfe1a..0faade9f69718829e302504b3faa905135ca64bf 100644 (file)
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -224,8 +224,8 @@ function useredit_shared_definition(&$mform) {
     if ( !empty($CFG->usetags) && has_capability('moodle/tag:create', get_context_instance(CONTEXT_SYSTEM)) ) {
         $mform->addElement('header', 'moodle_interests', get_string('interests'));
         $mform->addElement('textarea', 'interests', get_string('interestslist'), 'cols="45" rows="3"');
-        $mform->setHelpButton('interests', array(false, get_string('helpinterestslist'),
-                          false, true, false, get_string('helpinterestslist')));
+        $mform->setHelpButton('interests', array('interestslist', get_string('helpinterestslist'),
+                          false, true, false)); 
     }
     
     /// Moodle optional fields