role assign: MDL-17323 Show users from parent contexts ... Refine group labels again.

diff --git a/admin/roles/lib.php b/admin/roles/lib.php
index 2ea3a02ee16a8500056f780c34853a95cbe014cb..647c508d25ac5381dc129395a879f46f7cbf1a8e 100644 (file)
--- a/admin/roles/lib.php
+++ b/admin/roles/lib.php
@@ -1177,6 +1177,14 @@ class existing_role_holders extends role_assign_user_selector_base {
     }
 
     protected function this_con_group_name($search, $numusers) {
+        if ($this->context->contextlevel == CONTEXT_SYSTEM) {
+            // Special case in the System context.
+            if ($search) {
+                return get_string('extusersmatching', 'role', $search);
+            } else {
+                return get_string('extusers', 'role');
+            }
+        }
         $contexttype = get_contextlevel_name($this->context->contextlevel);
         if ($search) {
             $a = new stdClass;