$teacher is used in manual form. No need global. merged from 16stable.

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index 8382dd923f356b6bcdffa3b7bdf6ccd156576e72..0eb9a38ac678924decb6e209f77e665758de3af8 100755 (executable)
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -112,7 +112,6 @@ class enrolment_plugin_authorize
             }
         }
 
-        $teacher = get_teacher($course->id);
         $strcourses = get_string('courses');
         $strloginto = get_string('loginto', '', $course->shortname);
         $zerocost = $this->zero_cost($course);
@@ -142,6 +141,7 @@ class enrolment_plugin_authorize
 
         if ($course->password) {
             $password = '';
+            $teacher = get_teacher($course->id);
             include($CFG->dirroot.'/enrol/manual/enrol.html');
         }