Fixes #4890 Error in the setup at config step

setup/class_setup.inc

@@ -50,13 +50,13 @@ class setup
   function __construct()
   {
     $this->o_steps = array(
-      new Step_Welcome(),
-      new Step_Language(),
-      new Step_Checks(),
-      new Step_Ldap(),
-      new Step_Config_before_init(),
-      new Step_Migrate(),
-      new Step_Finish(),
+      new Step_Welcome($this),
+      new Step_Language($this),
+      new Step_Checks($this),
+      new Step_Ldap($this),
+      new Step_Config_before_init($this),
+      new Step_Migrate($this),
+      new Step_Finish($this),
     );
 
     $this->i_steps = count($this->o_steps);
@@ -67,11 +67,6 @@ class setup
       header("Location: index.php");
       exit();
     }
-
-    foreach ($this->o_steps as &$step) {
-      $step->parent = &$this;
-    }
-    unset($step);
   }
 
   function execute()
@@ -318,7 +313,7 @@ class setup
 
   function reBuildConfigStep ($completed = NULL)
   {
-    $this->o_steps[$this->i_config] = new Step_Config($this->captured_values);
+    $this->o_steps[$this->i_config] = new Step_Config($this, $this->captured_values);
     if ($completed !== NULL) {
       $this->o_steps[$this->i_config]->is_completed = $completed;
     }

setup/class_setupStep.inc

@@ -35,9 +35,9 @@ class setupStep extends simplePlugin
     return array();
   }
 
-  function __construct()
+  function __construct($parent)
   {
-    parent::__construct();
+    parent::__construct(NULL, NULL, $parent);
     $this->update_strings();
   }
 

setup/class_setupStep_Config.inc

@@ -47,10 +47,10 @@ class Step_Config extends configInLdap
     return array();
   }
 
-  function __construct($cv)
+  function __construct($parent, $cv)
   {
     global $config;
-    parent::__construct(CONFIGRDN.$config->current['BASE']);
+    parent::__construct(CONFIGRDN.$config->current['BASE'], NULL, $parent, TRUE);
 
     $this->attributesInfo['miscellaneous']['class'] = array('invisible');
     $this->attributesInfo['debug']['class'] = array('invisible');

setup/class_setupStep_Language.inc

@@ -47,9 +47,9 @@ class Step_Language extends setupStep
     );
   }
 
-  function __construct()
+  function __construct($parent)
   {
-    parent::__construct();
+    parent::__construct($parent);
     $this->lang = get_browser_language();
     $this->attributesAccess['lang_selected']->setSize(20);
   }

setup/class_setupStep_Ldap.inc

@@ -91,9 +91,9 @@ class Step_Ldap extends setupStep
     );
   }
 
-  function __construct()
+  function __construct($parent)
   {
-    parent::__construct();
+    parent::__construct($parent);
     $this->update_strings();
     $this->attributesAccess['base']->setSubmitForm(TRUE);
     $this->attributesAccess['admin']->setLinearRendering(TRUE);

setup/class_setupStep_Migrate.inc

@@ -212,9 +212,9 @@ class Step_Migrate extends setupStep
     );
   }
 
-  function __construct()
+  function __construct($parent)
   {
-    parent::__construct();
+    parent::__construct($parent);
     $this->fill_defaultRoles();
   }
 

setup/class_setupStep_Welcome.inc

@@ -35,9 +35,9 @@ class Step_Welcome extends setupStep
     );
   }
 
-  function __construct()
+  function __construct($parent)
   {
-    parent::__construct();
+    parent::__construct($parent);
 
     $this->is_enabled     = TRUE;
     $this->is_active      = TRUE;