diff --git a/installation/controller/default.php b/installation/controller/default.php
index 094139db2e1a1..21a9ce7796115 100644
--- a/installation/controller/default.php
+++ b/installation/controller/default.php
@@ -38,6 +38,9 @@ public function execute()
$defaultView = 'remove';
}
+ // Are we allowed to proceed?
+ $tmpModel = new InstallationModelSetup();
+
$vName = $this->getInput()->getWord('view', $defaultView);
$vFormat = $app->getDocument()->getType();
$lName = $this->getInput()->getWord('layout', 'default');
@@ -47,44 +50,39 @@ public function execute()
$this->getInput()->set('view', $defaultView);
}
- switch ($vName)
+ if ($tmpModel->getOptions())
{
- case 'preinstall':
- $model = new InstallationModelSetup;
- $checkOptions = false;
- $options = $model->getOptions();
-
- if ($model->getPhpOptionsSufficient())
- {
- $app->redirect('index.php');
- }
-
- break;
-
- case 'languages':
- case 'defaultlanguage':
- $model = new InstallationModelLanguages;
- $checkOptions = false;
- $options = [];
+ if ($vName !== 'preinstall')
+ {
+ $app->redirect('index.php?view=preinstall');
+ }
- break;
-
- default:
- $model = new InstallationModelSetup;
- $checkOptions = true;
- $options = $model->getOptions();
-
- if (!$model->getPhpOptionsSufficient())
- {
- $app->redirect('index.php?view=preinstall');
- }
-
- break;
+ $vName = 'preinstall';
+ $model = new InstallationModelSetup;
}
-
- if ($vName != $defaultView && ($checkOptions && empty($options)))
+ else
{
- $app->redirect('index.php');
+ switch ($vName)
+ {
+ case 'languages':
+ case 'defaultlanguage':
+ $model = new InstallationModelLanguages;
+ $checkOptions = false;
+ $options = [];
+
+ break;
+
+ default:
+ $model = new InstallationModelSetup;
+ $checkOptions = true;
+
+ break;
+ }
+
+ if ($vName != $defaultView && ($checkOptions && empty($options)))
+ {
+ $app->redirect('index.php');
+ }
}
// Register the layout paths for the view
diff --git a/installation/template/index.php b/installation/template/index.php
index 26bdd32118cb3..e54a6e7c6f0a3 100644
--- a/installation/template/index.php
+++ b/installation/template/index.php
@@ -18,18 +18,14 @@
// Output as HTML5
$this->setHtml5(true);
-// Load the JavaScript behaviors
-JHtml::_('bootstrap.framework');
-
+JHtml::_('behavior.core');
JHtml::_('behavior.keepalive');
JHtml::_('behavior.formvalidator');
-JHtml::_('behavior.core');
// Add installation js
JHtml::_('script', 'installation/template/js/installation.js', array('version' => 'auto'));
// Add Stylesheets
-JHtml::_('bootstrap.loadCss', true, $this->direction);
JHtml::_('stylesheet', 'installation/template/css/template.css', array('version' => 'auto'));
// Load JavaScript message titles
@@ -55,16 +51,8 @@
-
-
+
+
@@ -83,15 +71,16 @@