From: tjhunt <tjhunt>
Date: Tue, 18 Nov 2008 09:28:05 +0000 (+0000)
Subject: install / accesslib: Fix install problem
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=716dd16327dc3c159a5178bfdee88733916f4359;p=moodle.git

install / accesslib: Fix install problem
---

diff --git a/lib/accesslib.php b/lib/accesslib.php
index f6a70d0618..400ffd54a2 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2541,6 +2541,9 @@ function create_role($name, $shortname, $description, $legacy='') {
 
     //find free sortorder number
     $role->sortorder = $DB->get_field('role', 'MAX(sortorder) + 1', array());
+    if (empty($role->sortorder)) {
+        $role->sortorder = 1;
+    }
     $id = $DB->insert_record('role', $role);
 
     if (!$id) {
@@ -4138,12 +4141,12 @@ function allow_override($sroleid, $troleid) {
  * @param int troleid - target roleid
  * @return int - id or false
  */
-function allow_assign($sroleid, $troleid) {
+function allow_assign($fromroleid, $targetroleid) {
     global $DB;
 
     $record = new object;
-    $record->roleid      = $sroleid;
-    $record->allowassign = $troleid;
+    $record->roleid      = $fromroleid;
+    $record->allowassign = $targetroleid;
     return $DB->insert_record('role_allow_assign', $record);
 }