From 1307a14d62386c2ac6c5de31cde438b207cd4e2e Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Tue, 18 Jan 2005 18:42:26 +0000
Subject: [PATCH] Fix merged from HEAD ... the new check on isset($CFG...) had
 broken any non-internal enrolment  :-/

---
 lib/setup.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index 22a17f1705e..f81800fb8f4 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -14,10 +14,6 @@
         die;
     }
     
-    if (!isset($CFG->enrol)) { // This is a hack to fix bug 1598
-        $CFG->enrol = 'internal';
-    }
-
 /// If there are any errors in the standard libraries we want to know!
     error_reporting(E_ALL);
 
@@ -96,6 +92,11 @@
     error_reporting($CFG->debug);
 
 
+/// Set a default enrolment configuration (see bug 1598)
+    if (!isset($CFG->enrol)) {
+        $CFG->enrol = 'internal';
+    }
+
 /// File permissions on created directories in the $CFG->dataroot
 
     if (empty($CFG->directorypermissions)) {