diff --git a/modules/install/install.view.php b/modules/install/install.view.php index 38e34fdaa..e8b79ef45 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -124,6 +124,19 @@ class installView extends install $title = sprintf(Context::getLang('input_dbinfo_by_dbtype'), Context::get('db_type')); Context::set('title', $title); + + $error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type')); + if($_SERVER['HTTPS'] == 'on') + { + // Error occured when using https protocol at "ModuleHandler::init() ' + $parsedUrl = parse_url($error_return_url); + $error_return_url = ''; + if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path']; + if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query']; + if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment']; + } + Context::set('error_return_url', $error_return_url); + $this->setTemplateFile($tpl_filename); } diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html index 50285bf91..f3495114f 100644 --- a/modules/install/tpl/form.cubrid.html +++ b/modules/install/tpl/form.cubrid.html @@ -7,7 +7,7 @@
{$XE_VALIDATOR_MESSAGE}