Index: branches/5.2.x/core/install.php =================================================================== diff -u -N -r16692 -r16705 --- branches/5.2.x/core/install.php (.../install.php) (revision 16692) +++ branches/5.2.x/core/install.php (.../install.php) (revision 16705) @@ -1,6 +1,6 @@ toolkit = new kInstallToolkit(); $this->toolkit->setInstallator($this); $this->StepDBFile = FULL_PATH.'/'.REL_PATH.'/install/steps_db.xml'; - $this->baseURL = 'http://' . $_SERVER['HTTP_HOST'] . $this->toolkit->systemConfig->get('WebsitePath', 'Misc') . '/core/install/'; + + $https_mark = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : false; + $protocol = ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://'; + $this->baseURL = $protocol . $_SERVER['HTTP_HOST'] . $this->toolkit->systemConfig->get('WebsitePath', 'Misc') . '/core/install/'; + set_error_handler( Array(&$this, 'ErrorHandler') ); if ( $this->toolkit->systemConfigFound() ) { Index: branches/5.2.x/core/kernel/startup.php =================================================================== diff -u -N -r16633 -r16705 --- branches/5.2.x/core/kernel/startup.php (.../startup.php) (revision 16633) +++ branches/5.2.x/core/kernel/startup.php (.../startup.php) (revision 16705) @@ -1,6 +1,6 @@
'; $base_path = rtrim(str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])), '/'); - echo 'Go to installation script

'; + echo 'Go to installation script

'; flush(); exit; }