From: toyomoyo <toyomoyo>
Date: Mon, 9 Jul 2007 07:42:46 +0000 (+0000)
Subject: merged fix for MDL-9337, hidden teachers are visible when not enroled
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=75c2ecc88ef65b1c8184fdbc5ff4d5f21a0103f3;p=moodle.git

merged fix for MDL-9337, hidden teachers are visible when not enroled
---

diff --git a/enrol/manual/enrol.html b/enrol/manual/enrol.html
index 6422df421b..78686a3136 100644
--- a/enrol/manual/enrol.html
+++ b/enrol/manual/enrol.html
@@ -4,10 +4,10 @@
     
         print_box_start('generalbox centerpara');
         echo '<p align="center">';
-        if ($teacher) {
+        if (!empty($teacher)) {
             $teachername = "<a href=\"../user/view.php?id=$teacher->id&course=".SITEID."\">".fullname($teacher)."</a>.";
         } else {
-            $teachername = get_string('yourteacher', '', $course->teacher);
+            $teachername = get_string('defaultcourseteacher'); //get_string('yourteacher', '', $course->teacher);
         }
         print_string('enrolmentkeyfrom', '', $teachername);
  ?>
diff --git a/enrol/manual/enrol.php b/enrol/manual/enrol.php
index 8088fafbd9..d1a78d2704 100644
--- a/enrol/manual/enrol.php
+++ b/enrol/manual/enrol.php
@@ -95,8 +95,13 @@ function print_entry($course) {
             redirect($destination);
         }
     }
-
-    $teacher = get_teacher($course->id);
+    
+    if ($teachers = get_users_by_capability(get_context_instance(CONTEXT_COURSE, $course->id), 'moodle/course:update', 
+                                                            'u.*,ra.hidden', 'r.sortorder ASC',
+                                                            0, 1, '', '', false, true)) {        
+        $teacher = array_shift($teachers);
+    }
+    
     if (!isset($password)) {
         $password = '';
     }