From d3c0f411609b360cdbc18a106d257b6d1381fd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Wed, 11 Jul 2012 10:27:14 +0200
Subject: [PATCH 1/2] MDL-8249 fix participant page role selection

Thanks Michael de Raadt for spotting this regression.
---
 user/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user/index.php b/user/index.php
index 97fbe8f7210..c73e42b02a6 100644
--- a/user/index.php
+++ b/user/index.php
@@ -66,9 +66,9 @@
 
     $rolenames = role_fix_names(get_profile_roles($context), $context, ROLENAME_ALIAS, true);
     if ($isfrontpage) {
-        $rolenames = array(0=>get_string('allsiteusers', 'role'));
+        $rolenames[0] = get_string('allsiteusers', 'role');
     } else {
-        $rolenames = array(0=>get_string('allparticipants'));
+        $rolenames[0] = get_string('allparticipants');
     }
 
     // make sure other roles may not be selected by any means

From ef7090522d45b962713bc3e0e6e0009b29668289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Wed, 11 Jul 2012 10:29:04 +0200
Subject: [PATCH 2/2] MDL-8249 improve custom role strings

Credit goes to Michael de Raadt.
---
 lang/en/role.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/en/role.php b/lang/en/role.php
index b6a3de76418..257870437ff 100644
--- a/lang/en/role.php
+++ b/lang/en/role.php
@@ -150,7 +150,7 @@ $string['currentrole'] = 'Current role';
 $string['customroledescription'] = 'Custom description';
 $string['customroledescription_help'] = 'Descriptions of standard roles are localised automatically if the custom description is empty.';
 $string['customrolename'] = 'Custom full name';
-$string['customrolename_help'] = 'Names of standard roles are localised automatically if the custom name is empty. You must provide full name for all custom roles.';
+$string['customrolename_help'] = 'Names of standard roles are localised automatically if the custom name is empty. You must provide a full name for all custom roles.';
 $string['defaultrole'] = 'Default role';
 $string['defaultx'] = 'Default: {$a}';
 $string['defineroles'] = 'Define roles';
@@ -316,7 +316,7 @@ $string['roles_link'] = 'roles';
 $string['role:safeoverride'] = 'Override safe permissions for others';
 $string['roleselect'] = 'Select role';
 $string['roleshortname'] = 'Short name';
-$string['roleshortname_help'] = 'Role short name is a low level role identifier, only ASCII alphanumeric characters are allowed. Do not change short names of standard roles.';
+$string['roleshortname_help'] = 'Role short name is a low level role identifier in which only ASCII alphanumeric characters are allowed. Do not change short names of standard roles.';
 $string['role:switchroles'] = 'Switch to other roles';
 $string['roletoassign'] = 'Role to assign';
 $string['roletooverride'] = 'Role to override';