MDL-7389 paypal plugin reports error when student correctly enrolled; merged from...

diff --git a/enrol/paypal/ipn.php b/enrol/paypal/ipn.php
index 6f3f7038842bf0d9a3cbf7254247d49617a697bd..2f5cf4af4cb443ff0799e7f71cf6db4edfc7bded 100644 (file)
--- a/enrol/paypal/ipn.php
+++ b/enrol/paypal/ipn.php
@@ -154,7 +154,7 @@
                 email_paypal_error_to_admin("Error while trying to insert valid transaction", $data);
             }
 
-            if (enrol_into_course($course, $user, 'paypal')) {
+            if (!enrol_into_course($course, $user, 'paypal')) {
                 email_paypal_error_to_admin("Error while trying to enrol ".fullname($user)." in '$course->fullname'", $data);
                 die;
             } else {
@@ -203,7 +203,7 @@
 
 function email_paypal_error_to_admin($subject, $data) {
     $admin = get_admin();
-    $site = get_admin();
+    $site = get_site();
 
     $message = "$site->fullname:  Transaction failed.\n\n$subject\n\n";