Merge branch 'MDL-47761-master' of git://github.com/xow/moodle

enrol/self/lib.php

@@ -248,6 +248,8 @@ class enrol_self_plugin extends enrol_plugin {
             $form->display();
             $output = ob_get_clean();
             return $OUTPUT->box($output);
+        } else {
+            return $OUTPUT->box($enrolstatus);
         }
     }
 
@@ -265,7 +267,7 @@ class enrol_self_plugin extends enrol_plugin {
         if ($checkuserenrolment) {
             if (isguestuser()) {
                 // Can not enrol guest.
-                return get_string('canntenrol', 'enrol_self');
+                return get_string('noguestaccess', 'enrol');
             }
             // Check if user is already enroled.
             if ($DB->get_record('user_enrolments', array('userid' => $USER->id, 'enrolid' => $instance->id))) {

enrol/self/tests/self_test.php

@@ -602,7 +602,7 @@ class enrol_self_testcase extends advanced_testcase {
         $selfplugin->enrol_user($instance1, $user2->id, $editingteacherrole->id);
 
         $this->setUser($guest);
-        $this->assertSame($expectederrorstring, $selfplugin->can_self_enrol($instance1, true));
+        $this->assertSame(get_string('noguestaccess', 'enrol'), $selfplugin->can_self_enrol($instance1, true));
 
         $this->setUser($user1);
         $this->assertTrue($selfplugin->can_self_enrol($instance1, true));