Skip to content

Commit f13ecd9

Browse files
authored
Merge pull request #1051 from london89/patch-3
Update cycle.php
2 parents b429dad + 28185b7 commit f13ecd9

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

cycle.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,22 +183,25 @@
183183
echo "Running: mysql main db restore from file: " . $db_filename . PHP_EOL;
184184
DebMes("Running: mysql main db restore from file: " . $db_filename);
185185
$mysql_path = (substr(php_uname(), 0, 7) == "Windows") ? SERVER_ROOT . "/server/mysql/bin/mysql" : 'mysql';
186-
$mysqlParam = " -u " . DB_USER;
187-
if (DB_PASSWORD != '') $mysqlParam .= " -p" . DB_PASSWORD;
186+
$mysqlParam = " -h " . DB_HOST;
187+
$mysqlParam .= " -u " . DB_USER;
188+
if (DB_PASSWORD != '') $mysqlParam .= " -p'" . DB_PASSWORD."'";
188189
$mysqlParam .= " " . DB_NAME . " <" . $db_filename;
189190
exec($mysql_path . $mysqlParam);
190191

191192
if (file_exists($db_history_filename)) {
192193
echo "Running: mysql history db restore from file: " . $db_history_filename . PHP_EOL;
193194
DebMes("Running: mysql history db restore from file: " . $db_history_filename);
194195
$mysql_path = (substr(php_uname(), 0, 7) == "Windows") ? SERVER_ROOT . "/server/mysql/bin/mysql" : 'mysql';
195-
$mysqlParam = " -u " . DB_USER;
196-
if (DB_PASSWORD != '') $mysqlParam .= " -p" . DB_PASSWORD;
196+
$mysqlParam = " -h " . DB_HOST;
197+
$mysqlParam .= " -u " . DB_USER;
198+
if (DB_PASSWORD != '') $mysqlParam .= " -p'" . DB_PASSWORD."'";
197199
$mysqlParam .= " " . DB_NAME . " <" . $db_history_filename;
198200
exec($mysql_path . $mysqlParam);
199201
}
200202
}
201203

204+
202205
include_once("./load_settings.php"); //
203206

204207
echo "Checking modules.\n";

0 commit comments

Comments
 (0)