fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMC-1067

Browse Source
This commit is contained in:
Paula Quispe
2019-08-16 10:05:52 -04:00
parent 052ad71fe6
commit e12dae3c63
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/pear/Console/Getopt.php vendored
View File

@@ -141,7 +141,7 @@ class Console_Getopt {
* @access private * @access private
* *
*/ */
function _parseShortOption($arg, $short_options, &$opts, &$args) public static function _parseShortOption($arg, $short_options, &$opts, &$args)
{ {
for ($i = 0; $i < strlen($arg); $i++) { for ($i = 0; $i < strlen($arg); $i++) {
$opt = $arg{$i}; $opt = $arg{$i};

10
workflow/engine/classes/WorkspaceTools.php
View File

@@ -2085,8 +2085,14 @@ class WorkspaceTools
CLI::logging("+> Restoring database {$db->name} to $dbName\n"); CLI::logging("+> Restoring database {$db->name} to $dbName\n");
$versionBackupEngine = (isset($metadata->backupEngineVersion)) ? $metadata->backupEngineVersion : 1; $versionBackupEngine = (isset($metadata->backupEngineVersion)) ? $metadata->backupEngineVersion : 1;
$workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql", $aParameters, $versionBackupEngine, $connection); $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql", $aParameters, $versionBackupEngine, $connection);
$workspace->createDBUser($dbUser, ($workspace->dbGrantUserPassword != '' ? $workspace->dbGrantUserPassword : $db->pass), "localhost", $dbName, $connection); // Define the password
$workspace->createDBUser($dbUser, ($workspace->dbGrantUserPassword != '' ? $workspace->dbGrantUserPassword : $db->pass), "%", $dbName, $connection); if (empty($workspace->dbGrantUserPassword)) {
$bdPassword = $db->pass;
} else {
$bdPassword = $workspace->dbGrantUserPassword;
}
$workspace->createDBUser($dbUser, $bdPassword, "localhost", $dbName, $connection);
$workspace->createDBUser($dbUser, $bdPassword, "%", $dbName, $connection);
} }
} }