Check things only once

[gosa.git] / gosa-core / html / setup.php

diff --git a/gosa-core/html/setup.php b/gosa-core/html/setup.php
index b402b0116368345d8fdb8f79b7f318823c6ec181..9fa8eebec415261e593f4cec23c9418349714088 100644 (file)
--- a/gosa-core/html/setup.php
+++ b/gosa-core/html/setup.php
@@ -24,6 +24,11 @@
 require_once ("../include/php_setup.inc");
 require_once ("functions.inc");
 
+// Do not use the GOsa default error handler.
+// To do so we require a valid config object - and at this point 
+//  we doesn't have one.
+restore_error_handler();
+
 require_once("../setup/class_setup.inc");
 require_once("../setup/class_setupStep.inc");
 require_once("../setup/class_setupStep_Welcome.inc");
@@ -31,9 +36,6 @@ require_once("../setup/class_setupStep_Language.inc");
 require_once("../setup/class_setupStep_Checks.inc");
 require_once("../setup/class_setupStep_License.inc");
 require_once("../setup/class_setupStep_Ldap.inc");
-require_once("../setup/class_setupStep_Config1.inc");
-require_once("../setup/class_setupStep_Config2.inc");
-require_once("../setup/class_setupStep_Config3.inc");
 require_once("../setup/class_setupStep_Schema.inc");
 require_once("../setup/class_setupStep_Migrate.inc");
 require_once("../setup/class_setupStep_Feedback.inc");