diff --git a/application/libraries/service/Utility/Command.php b/application/libraries/service/Utility/Command.php index 9718c3d..c388501 100755 --- a/application/libraries/service/Utility/Command.php +++ b/application/libraries/service/Utility/Command.php @@ -42,8 +42,8 @@ class Command // return '"' . $argument . '"'; $pattern = [ - '/(^|[^\\\\])((\\\\\\\\)*[\s\'\"\$\|])/', - '/(^|[^\\\\])((\\\\\\\\)*\\\\([^\s\'\"\|\$\\\\]|$))/' + '/(^|[^\\\\])((\\\\\\\\)*[\s\`\'\"\$\|])/', + '/(^|[^\\\\])((\\\\\\\\)*\\\\([^\s\`\'\"\|\$\\\\]|$))/' ]; $replacement = [ '$1\\\\$2', diff --git a/application/models/repository_model.php b/application/models/repository_model.php index 99d30f5..3ffec55 100755 --- a/application/models/repository_model.php +++ b/application/models/repository_model.php @@ -1466,14 +1466,14 @@ class Repository_model extends CI_Model return FALSE; } + $branch = Command::wrapArgument($branch); + $filePath = Command::wrapArgument($filePath); + $command = GitCommand::getLastLog($branch, $filePath, $lastSha); if (!$command) { return FALSE; } - $branch = Command::wrapArgument($branch); - $filePath = Command::wrapArgument($filePath); - $log = $this->execCommand($rKey, $uKey, GIT_COMMAND_QUERY, $command); $log = rtrim($log, Helper::getDelimiter() . "\n"); $log = $this->_logStringToArray($log);