diff --git a/module/git/model.php b/module/git/model.php index 8d6ae4cda1..939176ae58 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -406,7 +406,7 @@ class gitModel extends model chdir($repo->path); $subPath = substr($path, strlen($repo->path) + 1); - $subPath = ltrim(DIRECTORY_SEPARATOR, $subPath); + $subPath = ltrim('/', $subPath); exec("$this->client rev-list -n 2 $revision -- $subPath", $lists); if(count($lists) == 2) list($nowRevision, $preRevision) = $lists; $cmd = "$this->client diff $preRevision $nowRevision -- $subPath"; @@ -437,7 +437,7 @@ class gitModel extends model $path = str_replace('%5C', '\\', $path); $subPath = substr($path, strlen($repo->path) + 1); - $subPath = ltrim(DIRECTORY_SEPARATOR, $subPath); + $subPath = ltrim('/', $subPath); chdir($repo->path); $cmd = "$this->client show $revision:$subPath"; $code = `$cmd`; diff --git a/module/report/view/blockreportlist.html.php b/module/report/view/blockreportlist.html.php index 0dfc19309c..37adba7b76 100644 --- a/module/report/view/blockreportlist.html.php +++ b/module/report/view/blockreportlist.html.php @@ -9,7 +9,7 @@ $list .= '|'; list($label, $module, $method, $params) = explode('|', $list); $class = $label == $title ? ' active' : ''; - echo html::a($this->createLink($module, $method, $params), " " . $label, '', "class='list-group-item $class'"); + echo html::a($this->createLink($module, $method, $params), $label, '', "class='list-group-item $class'"); } ?>