Permalink
Browse files

MDL-31956 fix enrol string components

Credit goes to Mark Nelson
  • Loading branch information...
1 parent 5f51b09 commit 2bf49964442e0feda8ead4009a9e7685e8ef593d @skodak skodak committed Mar 10, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 enrol/authorize/localfuncs.php
  2. +5 −5 enrol/paypal/ipn.php
@@ -233,7 +233,7 @@ function send_welcome_messages($orderdata) {
$a->profileurl = "$CFG->wwwroot/user/view.php?id=$lastuserid";
$a->paymenturl = "$CFG->wwwroot/enrol/authorize/index.php?user=$lastuserid";
$emailmessage = get_string('welcometocoursesemail', 'enrol_authorize', $a);
- $subject = get_string("enrolmentnew", '', format_string($SITE->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID))));
+ $subject = get_string("enrolmentnew", 'enrol', format_string($SITE->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID))));
$eventdata = new stdClass();
$eventdata->modulename = 'moodle';
View
@@ -243,7 +243,7 @@
$eventdata->name = 'paypal_enrolment';
$eventdata->userfrom = $teacher;
$eventdata->userto = $user;
- $eventdata->subject = get_string("enrolmentnew", '', $shortname);
+ $eventdata->subject = get_string("enrolmentnew", 'enrol', $shortname);
$eventdata->fullmessage = get_string('welcometocoursetext', '', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
@@ -262,8 +262,8 @@
$eventdata->name = 'paypal_enrolment';
$eventdata->userfrom = $user;
$eventdata->userto = $teacher;
- $eventdata->subject = get_string("enrolmentnew", '', $shortname);
- $eventdata->fullmessage = get_string('enrolmentnewuser', '', $a);
+ $eventdata->subject = get_string("enrolmentnew", 'enrol', $shortname);
+ $eventdata->fullmessage = get_string('enrolmentnewuser', 'enrol', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
@@ -281,8 +281,8 @@
$eventdata->name = 'paypal_enrolment';
$eventdata->userfrom = $user;
$eventdata->userto = $admin;
- $eventdata->subject = get_string("enrolmentnew", '', $shortname);
- $eventdata->fullmessage = get_string('enrolmentnewuser', '', $a);
+ $eventdata->subject = get_string("enrolmentnew", 'enrol', $shortname);
+ $eventdata->fullmessage = get_string('enrolmentnewuser', 'enrol', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';

0 comments on commit 2bf4996

Please sign in to comment.