Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
dgrammatiko committed Jul 21, 2017
1 parent 214db09 commit 7b04a78
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions installation/model/configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function setup($options)
// Create Db
if (!$databaseModel->createDatabase($options))
{
$this->deleteConfiguartion();
// $this->deleteConfiguartion();
return false;
}

Expand All @@ -55,14 +55,14 @@ public function setup($options)
// Create tables
if (!$databaseModel->createTables($options))
{
$this->deleteConfiguartion();
// $this->deleteConfiguartion();
return false;
}

// Attempt to create the root user.
if (!$this->createRootUser($options))
{
$this->deleteConfiguartion();
// $this->deleteConfiguartion();
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion installation/model/setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ public function initialise($options)
$options->db_pass,
$options->db_name,
$options->db_prefix,
isset($options->db_select) ? $options->db_select : false
$options->db_select
);
}
catch (RuntimeException $e)
Expand Down
1 change: 1 addition & 0 deletions installation/template/js/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ Joomla.installation = function(_container, _base) {
alert('good to go')
// You shall pass
install(['Config']);
install(['Config']);

// If all good (we need some code here)
goToPage('remove');
Expand Down
6 changes: 3 additions & 3 deletions installation/view/remove/html.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ public function render()
// Sample data

// Available languages
$langModel = new InstallationModelLanguages();
$this->items = $langModel->getItems();
$version = new Jversion();
$altModel = new InstallationModelChecks;
$langModel = new InstallationModelLanguages();

$this->items = $langModel->getItems();
$this->development = $version->isInDevelopmentState();
$this->options = $altModel->getOptions();
$this->phpoptions = $altModel->getPhpOptions();
$this->phpsettings = $altModel->getPhpSettings();

Expand Down

0 comments on commit 7b04a78

Please sign in to comment.