merged, fixing hidden teacher upgrade

diff --git a/lib/accesslib.php b/lib/accesslib.php
index fbcb5016d2d159d7f0ef89d29071b56ed4a22498..fd93f26e3aa1a6a380d812caf2a4cfee349235be 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1471,10 +1471,17 @@ function moodle_install_roles() {
 
                 // assign the default student role
                 $coursecontext = get_context_instance(CONTEXT_COURSE, $teacher->course); // needs cache
+                // hidden teacher
+                if ($teacher->authority == 0) {
+                    $hiddenteacher = 1;  
+                } else {
+                    $hiddenteacher = 0;  
+                }              
+                
                 if ($teacher->editall) { // editting teacher
-                    role_assign($editteacherrole, $teacher->userid, 0, $coursecontext->id);
+                    role_assign($editteacherrole, $teacher->userid, 0, $coursecontext->id, 0, 0, $hiddenteacher);
                 } else {
-                    role_assign($noneditteacherrole, $teacher->userid, 0, $coursecontext->id);
+                    role_assign($noneditteacherrole, $teacher->userid, 0, $coursecontext->id, 0, 0, $hiddenteacher);
                 }
                 $progresscount++;
                 print_progress($progresscount, $totalcount, 5, 1, 'Processing role assignments');