Fixes MDL-12539 "Help link text for all admin/user filters are broken".

diff --git a/user/filters/courserole.php b/user/filters/courserole.php
index 6c4564f56923abb7958d99a14efcbd700e42df17..9d6c23fce92d199cba3ac6448728e4c9a444b459 100644 (file)
--- a/user/filters/courserole.php
+++ b/user/filters/courserole.php
@@ -47,7 +47,7 @@ class user_filter_courserole extends user_filter_type {
         $objs[] =& $mform->createElement('select', $this->_name .'_ct', null, $this->get_course_categories());
         $objs[] =& $mform->createElement('text', $this->_name, null);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('courserole', '', 'filters'));
+        $grp->setHelpButton(array('courserole', $this->_label, 'filters'));
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name.'_grp');
         }

diff --git a/user/filters/date.php b/user/filters/date.php
index 98b734bee1ec061a6ca253a3ac29cbeac716b58f..17e72f772ad9672300cc17cdea592f5c080d9daf 100755 (executable)
--- a/user/filters/date.php
+++ b/user/filters/date.php
@@ -35,7 +35,7 @@ class user_filter_date extends user_filter_type {
         $objs[] =& $mform->createElement('checkbox', $this->_name.'_eck', null, get_string('isbefore', 'filters'));
         $objs[] =& $mform->createElement('date_selector', $this->_name.'_edt', null);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('date','','filters'));
+        $grp->setHelpButton(array('date',$this->_label,'filters'));
 
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name.'_grp');

diff --git a/user/filters/globalrole.php b/user/filters/globalrole.php
index 53a03ee3b3be73ec6d1d3dc431134018c07c700c..b8781dfcd140380a27dcbde7c278e68707724c84 100644 (file)
--- a/user/filters/globalrole.php
+++ b/user/filters/globalrole.php
@@ -33,7 +33,7 @@ class user_filter_globalrole extends user_filter_type {
      */
     function setupForm(&$mform) {
         $obj =& $mform->addElement('select', $this->_name, $this->_label, $this->get_roles());
-        $obj->setHelpButton(array('globalrole', '', 'filters'));
+        $obj->setHelpButton(array('globalrole', $this->_label, 'filters'));
         $mform->setDefault($this->_name, 0);
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name);

diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php
index bb7fefcb4e7333adc8d9f09e67cdf3a7167233dc..454a4e23c1f799d87ebd6411bb7736b3006509c0 100644 (file)
--- a/user/filters/profilefield.php
+++ b/user/filters/profilefield.php
@@ -61,7 +61,7 @@ class user_filter_profilefield extends user_filter_type {
         $objs[] =& $mform->createElement('select', $this->_name.'_op', null, $this->get_operators());
         $objs[] =& $mform->createElement('text', $this->_name, null);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('profilefield','','filters'));
+        $grp->setHelpButton(array('profilefield',$this->_label,'filters'));
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name.'_grp');
         }

diff --git a/user/filters/select.php b/user/filters/select.php
index 7498c55cff1b3e96a72e33a360bc4663d34644fc..49c6e3bb747a58e9b47856b400833d608d6591b2 100644 (file)
--- a/user/filters/select.php
+++ b/user/filters/select.php
@@ -50,7 +50,7 @@ class user_filter_select extends user_filter_type {
         $objs[] =& $mform->createElement('select', $this->_name.'_op', null, $this->get_operators());
         $objs[] =& $mform->createElement('select', $this->_name, null, $this->_options);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('select', '', 'filters'));
+        $grp->setHelpButton(array('select', $this->_label, 'filters'));
         $mform->disabledIf($this->_name, $this->_name.'_op', 'eq', 0);
         if (!is_null($this->_default)) {
             $mform->setDefault($this->_name, $this->_default);

diff --git a/user/filters/simpleselect.php b/user/filters/simpleselect.php
index 81062cea4dd9b86b6f91d7605e9ffeaf34ec0d2c..94e75780354198cd9a58990dfa1b9cc8ffc8c8a4 100644 (file)
--- a/user/filters/simpleselect.php
+++ b/user/filters/simpleselect.php
@@ -34,7 +34,7 @@ class user_filter_simpleselect extends user_filter_type {
     function setupForm(&$mform) {
         $choices = array(''=>get_string('anyvalue', 'filters')) + $this->_options;
         $mform->addElement('select', $this->_name, $this->_label, $choices);
-        $mform->setHelpButton($this->_name, array('simpleselect', '', 'filters'));
+        $mform->setHelpButton($this->_name, array('simpleselect', $this->_label, 'filters'));
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name);
         }

diff --git a/user/filters/text.php b/user/filters/text.php
index b92624be03a5910768e2ebbb4e7b759351200585..24d5497d776eeea1f66cdfa9660ab21a293dd9df 100644 (file)
--- a/user/filters/text.php
+++ b/user/filters/text.php
@@ -42,7 +42,7 @@ class user_filter_text extends user_filter_type {
         $objs[] =& $mform->createElement('select', $this->_name.'_op', null, $this->getOperators());
         $objs[] =& $mform->createElement('text', $this->_name, null);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('text','','filters'));
+        $grp->setHelpButton(array('text',$this->_label,'filters'));
         $mform->disabledIf($this->_name, $this->_name.'_op', 'eq', 5);
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name.'_grp');