From f7ae52f9dafa2ee42e84dca7a2b42f4e90d2cef0 Mon Sep 17 00:00:00 2001
From: Petr Skoda <commits@skodak.org>
Date: Tue, 27 Dec 2011 14:55:00 +0100
Subject: [PATCH] MDL-30809 do not add guest info to add course form if default
 instance prevented

---
 enrol/guest/lib.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/enrol/guest/lib.php b/enrol/guest/lib.php
index b15febade0b..a9229d8f243 100644
--- a/enrol/guest/lib.php
+++ b/enrol/guest/lib.php
@@ -163,8 +163,12 @@ class enrol_guest_plugin extends enrol_plugin {
     public function course_edit_form($instance, MoodleQuickForm $mform, $data, $context) {
 
         $i = isset($instance->id) ? $instance->id : 0;
-        $plugin = enrol_get_plugin('guest');
-        $header = $plugin->get_instance_name($instance);
+
+        if (!$i and !$this->get_config('defaultenrol')) {
+            return;
+        }
+
+        $header = $this->get_instance_name($instance);
         $config = has_capability('enrol/guest:config', $context);
 
         $mform->addElement('header', 'enrol_guest_header_'.$i, $header);
@@ -215,6 +219,10 @@ class enrol_guest_plugin extends enrol_plugin {
 
         $i = isset($instance->id) ? $instance->id : 0;
 
+        if (!isset($data['enrol_guest_status_'.$i])) {
+            return $errors;
+        }
+
         $password = empty($data['enrol_guest_password_'.$i]) ? '' : $data['enrol_guest_password_'.$i];
         $checkpassword = false;