Index: branches/5.2.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r15333 -r15375
--- branches/5.2.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 15333)
+++ branches/5.2.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 15375)
@@ -1,6 +1,6 @@
systemConfig[$section][$key] ? $this->systemConfig[$section][$key] : $default;
+ return isset($this->systemConfig[$section][$key]) ? $this->systemConfig[$section][$key] : $default;
}
/**
Index: branches/5.2.x/core/install/steps_db.xml
===================================================================
diff -u -N -r15012 -r15375
--- branches/5.2.x/core/install/steps_db.xml (.../steps_db.xml) (revision 15012)
+++ branches/5.2.x/core/install/steps_db.xml (.../steps_db.xml) (revision 15375)
@@ -107,7 +107,7 @@
Web Path to Installation - web path to the root of your In-Portal installation. For example, - if your In-Portal will be running at http://www.your-website.com, then Web Path to Installation should be set to / + if your In-Portal will be running at http://www.your-website.com, then Web Path to Installation should not be set since In-Portal is setup in the root of the domain. In case if your In-Portal will be running under http://www.your-website.com/in-portal/, then it should be set to /in-portal (no trailing slash). This setting is auto-detected during the initial installation step, but can be adjusted at Installation Maintenance step.
Index: branches/5.2.x/core/install/step_templates/sys_config.tpl =================================================================== diff -u -N -r15165 -r15375 --- branches/5.2.x/core/install/step_templates/sys_config.tpl (.../sys_config.tpl) (revision 15165) +++ branches/5.2.x/core/install/step_templates/sys_config.tpl (.../sys_config.tpl) (revision 15375) @@ -1,6 +1,6 @@ Array ('type' => 'text', 'title' => 'Web Path to Installation', 'section' => 'Misc', 'required' => 1, 'default' => '/'), + 'WebsitePath' => Array ('type' => 'text', 'title' => 'Web Path to Installation', 'section' => 'Misc', 'required' => 1, 'default' => ''), 'WriteablePath' => Array ('type' => 'text', 'title' => 'Path to Writable folder', 'section' => 'Misc', 'required' => 1, 'default' => '/system'), 'RestrictedPath' => Array ('type' => 'text', 'title' => 'Path to Restricted folder', 'section' => 'Misc', 'required' => 1, 'default' => '/system/.restricted'), 'AdminDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin folder', 'section' => 'Misc', 'default' => '/admin'),