Commit 2f8caa1d0da81387554dcba0548c6960d9eaeb81

Authored by jarrett
1 parent 675597e5

Story ID:1166880 Small Change

Commited By: Jarrett Jordaan

Reviewed By: Megan Watson
setup/migrate/steps/migrateDatabase.php
@@ -164,7 +164,6 @@ class migrateDatabase extends Step @@ -164,7 +164,6 @@ class migrateDatabase extends Step
164 $dbAdminPass = $dbSettings['dbAdminPass']; 164 $dbAdminPass = $dbSettings['dbAdminPass'];
165 $dbName = $dbSettings['dbName']; 165 $dbName = $dbSettings['dbName'];
166 $cmd = "$exe -u{$dbAdminUser} -p{$dbAdminPass} $dbName > ".$sqlFile; 166 $cmd = "$exe -u{$dbAdminUser} -p{$dbAdminPass} $dbName > ".$sqlFile;
167 - echo $cmd;  
168 $response = $this->util->pexec($cmd); 167 $response = $this->util->pexec($cmd);
169 if(file_exists($sqlFile)) { 168 if(file_exists($sqlFile)) {
170 $fileContents = file_get_contents($sqlFile); 169 $fileContents = file_get_contents($sqlFile);
setup/upgrade/step.php
@@ -288,6 +288,7 @@ class Step @@ -288,6 +288,7 @@ class Step
288 * @return boolean 288 * @return boolean
289 */ 289 */
290 public function inStep($name) { 290 public function inStep($name) {
  291 + if(!isset($_GET['step_name'])) return false;
291 if($_GET['step_name'] == $name) 292 if($_GET['step_name'] == $name)
292 return true; 293 return true;
293 return false; 294 return false;