I found a new function: user_has_role_assignment(). Merged from MOODLE_17_STABLE.

diff --git a/enrol/authorize/uploadcsv.php b/enrol/authorize/uploadcsv.php
index 1dcdeef978becdc31b249db3d87b998aa0a503e6..5b7b1bb8f762e786fb211a5b54cc4d4bf44aec66 100644 (file)
--- a/enrol/authorize/uploadcsv.php
+++ b/enrol/authorize/uploadcsv.php
@@ -172,8 +172,7 @@ function authorize_process_csv($filename)
 
         // If user wasn't enrolled, enrol now. Ignore otherwise. Because admin user might submit this file again.
         if ($role = get_default_course_role($course)) {
-            $ra = get_record('role_assignments', 'roleid', $role->id, 'contextid', $coursecontext->id, 'userid', $user->id);
-            if (empty($ra)) { // Not enrolled, so enrol
+            if (! user_has_role_assignment($user->id, $role->id, $coursecontext->id)) {
                 $timestart = $timeend = 0;
                 if ($course->enrolperiod) {
                     $timestart = time();

diff --git a/enrol/authorize/version.php b/enrol/authorize/version.php
index 9aa012f225c801faf57ae8eb80643464a711868f..d5f970544b2cd9930b8f402e071ebbb1516c770c 100755 (executable)
--- a/enrol/authorize/version.php
+++ b/enrol/authorize/version.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 
 $plugin->version  = 2006101700;
-$plugin->requires = 2006091700;
+$plugin->requires = 2006100401;
 
 ?>