Merged MDL-13676 Fixed some mistakes I just made

diff --git a/lib/accesslib.php b/lib/accesslib.php
index c62f1b6b753b230b01abcc702ea6927ea2cafd05..9283e99ba7cbc2daf9e58de6d29d4be333f2fb30 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -4035,7 +4035,6 @@ function get_user_roles_in_context($userid, $context, $view=true){
                 continue;
             }
             $rolenames[$userrole->roleid] = $userrole->name;
-            $rolestring .= '<a href="'.$CFG->wwwroot.'/user/index.php?contextid='.$userrole->contextid.'&amp;roleid='.$userrole->roleid.'">'.$userrole->name.'</a>, ';
         }
 
         $rolenames = role_fix_names($rolenames, $context);   // Substitute aliases

diff --git a/lib/db/install.xml b/lib/db/install.xml
index 24b58eec8f7c5272d8d25f020e209d8e768e0797..69b53b2f7fbd53d6f4b97bfba55c78278ad0bb84 100644 (file)
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -858,9 +858,8 @@
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="roleid"/>
         <FIELD NAME="roleid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="contextid"/>
-        <FIELD NAME="contextid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="roleid" NEXT="text"/>
-        <FIELD NAME="text" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="contextid" NEXT="name"/>
-        <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="text"/>
+        <FIELD NAME="contextid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="roleid" NEXT="name"/>
+        <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="contextid"/>
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="roleid"/>