Skip to content

Commit 377ed08

Browse files
committed
Remove check for empty database
1 parent c9e635c commit 377ed08

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

modules/system/console/OctoberInstall.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ protected function setupLanguage()
8686

8787
$this->setEnvVar('APP_LOCALE', $locale);
8888
}
89-
catch (Exception $e) {
90-
$this->output->error($e->getMessage());
89+
catch (Exception $ex) {
90+
$this->output->error($ex->getMessage());
9191
return $this->setupLanguage();
9292
}
9393
}
@@ -302,8 +302,8 @@ protected function setupLicenseKey()
302302
// Thank the user
303303
$this->output->success('Thank you for supporting October CMS!');
304304
}
305-
catch (Exception $e) {
306-
$this->output->error($e->getMessage());
305+
catch (Exception $ex) {
306+
$this->output->error($ex->getMessage());
307307
return $this->setupLicenseKey();
308308
}
309309
}

modules/system/traits/SetupHelper.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,14 @@ protected function checkDatabase($type, $host, $port, $name, $user, $pass)
177177
$fetch = $db->query('show tables', PDO::FETCH_NUM);
178178
}
179179

180-
$tables = 0;
181-
while ($fetch->fetch()) {
182-
$tables++;
183-
}
184-
185-
if ($tables > 0) {
186-
throw new Exception(sprintf('Database "%s" is not empty. Please empty the database or specify another database.', $this->e($name)));
187-
}
180+
// $tables = 0;
181+
// while ($fetch->fetch()) {
182+
// $tables++;
183+
// }
184+
185+
// if ($tables > 0) {
186+
// throw new Exception(sprintf('Database "%s" is not empty. Please empty the database or specify another database.', $name));
187+
// }
188188
}
189189

190190
/**

0 commit comments

Comments
 (0)