Index: branches/RC/core/install.php =================================================================== diff -u -N -r10924 -r11071 --- branches/RC/core/install.php (.../install.php) (revision 10924) +++ branches/RC/core/install.php (.../install.php) (revision 11071) @@ -135,7 +135,7 @@ // connect toolkit required for module installations to installator and via versa require_once FULL_PATH . REL_PATH . '/install/install_toolkit.php'; $this->toolkit = new kInstallToolkit(); - $this->toolkit->setInstallator(&$this); + $this->toolkit->setInstallator($this); $this->StepDBFile = FULL_PATH.'/'.REL_PATH.'/install/steps_db.xml'; @@ -411,15 +411,19 @@ break; case 'select_license': - if ($this->GetVar('license_source') == 2) { + $license_source = $this->GetVar('license_source'); + if ($license_source == 2) { // license from file -> file must be uploaded $upload_error = $_FILES['license_file']['error']; if ($upload_error != UPLOAD_ERR_OK) { $this->errorMessage = 'Missing License File'; } - - $status = $this->errorMessage == ''; } + elseif (!is_numeric($license_source)) { + $this->errorMessage = 'Please select license'; + } + + $status = $this->errorMessage == ''; break; case 'root_password':