MDL-13262 - role related user filters were assuming roleids because array_merge

was stomping on keys. Patch by Dennis Rochford

merged from MOODLE_19_STABLE

diff --git a/user/filters/courserole.php b/user/filters/courserole.php
index 9d6c23fce92d199cba3ac6448728e4c9a444b459..f200322e63c460d0111f5ceb878018ce89703c20 100644 (file)
--- a/user/filters/courserole.php
+++ b/user/filters/courserole.php
@@ -22,7 +22,7 @@ class user_filter_courserole extends user_filter_type {
      */
     function get_roles() {
         $context = get_context_instance(CONTEXT_SYSTEM);
-        $roles = array_merge(array(0=> get_string('anyrole','filters')), get_assignable_roles($context));
+        $roles = array(0=> get_string('anyrole','filters')) + get_assignable_roles($context);
         return $roles;
     }
 
@@ -34,7 +34,7 @@ class user_filter_courserole extends user_filter_type {
         $displaylist = array();
         $parentlist = array();
         make_categories_list($displaylist, $parentlist);
-        return array_merge(array(0=> get_string('anycategory', 'filters')), $displaylist);
+        return array(0=> get_string('anycategory', 'filters')) + $displaylist;
     }
 
     /**

diff --git a/user/filters/globalrole.php b/user/filters/globalrole.php
index b8781dfcd140380a27dcbde7c278e68707724c84..d877356e923a535359122104087795ba1b2bcf17 100644 (file)
--- a/user/filters/globalrole.php
+++ b/user/filters/globalrole.php
@@ -23,7 +23,7 @@ class user_filter_globalrole extends user_filter_type {
      */
     function get_roles() {
         $context = get_context_instance(CONTEXT_SYSTEM);
-        $roles = array_merge(array(0=> get_string('anyrole','filters')), get_assignable_roles($context));
+        $roles = array(0=> get_string('anyrole','filters')) + get_assignable_roles($context);
         return $roles;
     }