Skip to content
Snippets Groups Projects
Commit d29bc5ff authored by Demian Katz's avatar Demian Katz
Browse files

Cleaned up whitespace.

parent 617bd4bd
No related merge requests found
...@@ -198,7 +198,7 @@ class UpgradeController extends AbstractBase ...@@ -198,7 +198,7 @@ class UpgradeController extends AbstractBase
public function fixdatabaseAction() public function fixdatabaseAction()
{ {
$sql = ''; $sql = '';
try { try {
// Set up the helper with information from our SQL file: // Set up the helper with information from our SQL file:
$this->dbUpgrade() $this->dbUpgrade()
...@@ -242,7 +242,7 @@ class UpgradeController extends AbstractBase ...@@ -242,7 +242,7 @@ class UpgradeController extends AbstractBase
$sql .= $this->dbUpgrade() $sql .= $this->dbUpgrade()
->createMissingColumns($missingCols, $this->logsql); ->createMissingColumns($missingCols, $this->logsql);
} }
// Check for modified columns. // Check for modified columns.
$mC = $this->logsql ? $missingCols : array(); $mC = $this->logsql ? $missingCols : array();
$modifiedCols = $this->dbUpgrade()->getModifiedColumns($mT, $mC); $modifiedCols = $this->dbUpgrade()->getModifiedColumns($mT, $mC);
...@@ -286,7 +286,7 @@ class UpgradeController extends AbstractBase ...@@ -286,7 +286,7 @@ class UpgradeController extends AbstractBase
} }
return $this->forwardTo('Upgrade', 'Home'); return $this->forwardTo('Upgrade', 'Home');
} }
/** /**
* Prompt the user for database credentials. * Prompt the user for database credentials.
* *
...@@ -299,8 +299,8 @@ class UpgradeController extends AbstractBase ...@@ -299,8 +299,8 @@ class UpgradeController extends AbstractBase
unset($this->session->sql); unset($this->session->sql);
return $this->forwardTo('Upgrade', 'Home'); return $this->forwardTo('Upgrade', 'Home');
} }
return $this->createViewModel(array('sql' => $this->session->sql)); return $this->createViewModel(array('sql' => $this->session->sql));
} }
/** /**
...@@ -316,7 +316,7 @@ class UpgradeController extends AbstractBase ...@@ -316,7 +316,7 @@ class UpgradeController extends AbstractBase
return $this->forwardTo('Upgrade', 'FixDatabase'); return $this->forwardTo('Upgrade', 'FixDatabase');
} else { } else {
$dbrootuser = $this->params()->fromPost('dbrootuser', 'root'); $dbrootuser = $this->params()->fromPost('dbrootuser', 'root');
// Process form submission: // Process form submission:
if (strlen($this->params()->fromPost('submit', '')) > 0) { if (strlen($this->params()->fromPost('submit', '')) > 0) {
$pass = $this->params()->fromPost('dbrootpass'); $pass = $this->params()->fromPost('dbrootpass');
...@@ -333,7 +333,7 @@ class UpgradeController extends AbstractBase ...@@ -333,7 +333,7 @@ class UpgradeController extends AbstractBase
$this->flashMessenger()->setNamespace('error') $this->flashMessenger()->setNamespace('error')
->addMessage('Could not connect; please try again.'); ->addMessage('Could not connect; please try again.');
} }
} }
} }
return $this->createViewModel(array('dbrootuser' => $dbrootuser)); return $this->createViewModel(array('dbrootuser' => $dbrootuser));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment