From 8c6b980803e911bcc47dfc0bc847cef226ac40fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Tue, 25 Jun 2013 10:18:22 +0200
Subject: [PATCH 1/2] MDL-17081 fix invalid role XML schema

---
 admin/roles/role_schema.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/admin/roles/role_schema.xml b/admin/roles/role_schema.xml
index e9e2bb5db61..f0a33c9ecc0 100644
--- a/admin/roles/role_schema.xml
+++ b/admin/roles/role_schema.xml
@@ -15,12 +15,6 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:element name="name">
-        <xs:complexType/>
-    </xs:element>
-    <xs:element name="description">
-        <xs:complexType/>
-    </xs:element>
     <xs:element name="archetype" type="xs:string"/>
     <xs:element name="contextlevels">
         <xs:complexType>
@@ -61,9 +55,11 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    <xs:element name="shortname" type="xs:string"/>
+    <xs:element name="name" type="xs:string"/>
+    <xs:element name="description" type="xs:string"/>
     <xs:element name="inherit" type="xs:string"/>
     <xs:element name="allow" type="xs:string"/>
     <xs:element name="prevent" type="xs:string"/>
     <xs:element name="prohibit" type="xs:string"/>
-    <xs:element name="shortname" type="xs:string"/>
 </xs:schema>

From 4dd680c74e00b69aaf4781cb3932b8cb34729df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Tue, 25 Jun 2013 15:15:46 +0200
Subject: [PATCH 2/2] MDL-17081 allow role reset to self

The use case is importing of incomplete XML preset - keep current + preset changes. This also discards any pending changes.
---
 admin/roles/classes/preset_form.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/admin/roles/classes/preset_form.php b/admin/roles/classes/preset_form.php
index 79a775137f5..ff2024d7d9c 100644
--- a/admin/roles/classes/preset_form.php
+++ b/admin/roles/classes/preset_form.php
@@ -52,10 +52,7 @@ class core_role_preset_form extends moodleform {
         $group = get_string('role', 'core');
         $options[$group] = array();
         foreach (role_get_names(null, ROLENAME_BOTH) as $role) {
-            if ($data['roleid'] == $role->id) {
-                // Do not reset to self.
-                continue;
-            }
+            // Allow reset to self too, it may be useful when importing incomplete XML preset.
             $options[$group][$role->id] = $role->localname;
         }