Get payment managers at COURSE level. Merged from 17stable.

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index 27f11392ac6fb7c6f3f5526e1d11d5ef0ebbaa37..5a1ec3e18baaf2567aa9a212e8590496b1d25b01 100755 (executable)
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -231,10 +231,10 @@ class enrolment_plugin_authorize
             $a->course = $course->shortname;
             $a->orderid = $order->id;
             $emailsubject = get_string('adminnewordersubject', 'enrol_authorize', $a);
-            $context = get_context_instance(CONTEXT_SYSTEM);
-            if ($sitepaymentmanagers = get_users_by_capability($context, 'enrol/authorize:managepayments')) {
-                foreach ($sitepaymentmanagers as $sitepaymentmanager) {
-                    email_to_user($sitepaymentmanager, $USER, $emailsubject, $emailmessage);
+            $context = get_context_instance(CONTEXT_COURSE, $course->id);
+            if ($paymentmanagers = get_users_by_capability($context, 'enrol/authorize:managepayments')) {
+                foreach ($paymentmanagers as $paymentmanager) {
+                    email_to_user($paymentmanager, $USER, $emailsubject, $emailmessage);
                 }
             }
             redirect($CFG->wwwroot, get_string("reviewnotify", "enrol_authorize"), '30');

diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index aa1876e5ca20aa7d117ea3a931bc0c0c3748f23a..1336641908ae1aa76a7effbff94aa7f7149c888c 100644 (file)
--- a/enrol/authorize/index.php
+++ b/enrol/authorize/index.php
@@ -12,7 +12,7 @@
 /// Only site users can access to this page
     require_login(); // Don't use $courseid! User may want to see old orders.
 
-    if (has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM, SITEID), $USER->id, false)) {
+    if (has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM), $USER->id, false)) {
         error("Guests cannot use this page.");
     }