From: poltawski <poltawski>
Date: Fri, 8 Feb 2008 12:16:00 +0000 (+0000)
Subject: MDL-13262 - role related user filters were assuming roleids because array_merge
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=85de84a89fc301b6af43cadb4188cedc9b625e97;p=moodle.git

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 9d6c23fce9..f200322e63 100644
--- 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 b8781dfcd1..d877356e92 100644
--- 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;
     }