fixed problem with apostrophe in role names and description when creating roles durin...

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 19af8e50ec0fda5ff7bf1d3cf8763675bdf5e078..2aa389d99ce268afcf986500cce8228d49b3f7cd 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -6047,7 +6047,7 @@
             
                     // done finding a unique name
             
-                    $newroleid = create_role($roledata->name,$roledata->shortname,'');
+                    $newroleid = create_role(addslashes($roledata->name),addslashes($roledata->shortname),'');
                     $status = backup_putid($restore->backup_unique_code,"role",$oldroleid,
                                      $newroleid); // adding a new id
                     foreach ($roledata->capabilities as $capability) {

diff --git a/lib/accesslib.php b/lib/accesslib.php
index e44477673f6ee509283c72e0f6e1326dccd8d138..687010361bd107691ac57fa38a588c5aedda5a68 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1212,18 +1212,18 @@ function moodle_install_roles() {
 /// Create default/legacy roles and capabilities.
 /// (1 legacy capability per legacy role at system level).
 
-    $adminrole = create_role(get_string('administrator'), 'admin',
-                             get_string('administratordescription'), 'moodle/legacy:admin');
-    $coursecreatorrole  = create_role(get_string('coursecreators'), 'coursecreator',
-                                      get_string('coursecreatorsdescription'), 'moodle/legacy:coursecreator');
-    $editteacherrole    = create_role(get_string('defaultcourseteacher'), 'editingteacher',
-                                      get_string('defaultcourseteacherdescription'), 'moodle/legacy:editingteacher');
-    $noneditteacherrole = create_role(get_string('noneditingteacher'), 'teacher',
-                                      get_string('noneditingteacherdescription'), 'moodle/legacy:teacher');
-    $studentrole        = create_role(get_string('defaultcoursestudent'), 'student',
-                                      get_string('defaultcoursestudentdescription'), 'moodle/legacy:student');
-    $guestrole          = create_role(get_string('guest'), 'guest',
-                                      get_string('guestdescription'), 'moodle/legacy:guest');
+    $adminrole          = create_role(addslashes(get_string('administrator')), 'admin',
+                                      addslashes(get_string('administratordescription')), 'moodle/legacy:admin');
+    $coursecreatorrole  = create_role(addslashes(get_string('coursecreators')), 'coursecreator',
+                                      addslashes(get_string('coursecreatorsdescription')), 'moodle/legacy:coursecreator');
+    $editteacherrole    = create_role(addslashes(get_string('defaultcourseteacher')), 'editingteacher',
+                                      addslashes(get_string('defaultcourseteacherdescription')), 'moodle/legacy:editingteacher');
+    $noneditteacherrole = create_role(addslashes(get_string('noneditingteacher')), 'teacher',
+                                      addslashes(get_string('noneditingteacherdescription')), 'moodle/legacy:teacher');
+    $studentrole        = create_role(addslashes(get_string('defaultcoursestudent')), 'student',
+                                      addslashes(get_string('defaultcoursestudentdescription')), 'moodle/legacy:student');
+    $guestrole          = create_role(addslashes(get_string('guest')), 'guest',
+                                      addslashes(get_string('guestdescription')), 'moodle/legacy:guest');
     
 /// Now is the correct moment to install capabilities - after creation of legacy roles, but before assigning of roles