merged, ignore site level course teacher assignments when upgrading from 1.6 or below

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 2eb16b19de48a34a6af06ebb223ce974f4042a95..80c3cf1b8a0d4512022bbd1a4ce8bc67fba7b819 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1228,7 +1228,10 @@ function moodle_install_roles() {
         if ($rs = get_recordset('user_teachers')) {
             while (! $rs->EOF) {
                 $teacher = $rs->FetchObj();
-
+                // ignore site level teacher assignments
+                if ($teacher->course == SITEID) {
+                    continue;  
+                }
                 // populate the user_lastaccess table
                 $access = new object();
                 $access->timeaccess = $teacher->timeaccess;