diff options
| author | fox <[email protected]> | 2020-03-03 05:36:22 +0000 |
|---|---|---|
| committer | Gogs <[email protected]> | 2020-03-03 05:36:22 +0000 |
| commit | da926067abf2645ed3ac24add2354a2c52ea4964 (patch) | |
| tree | bb276cd8a5d72ae2745eae5319535358a546a93c | |
| parent | 8ad523fcec9da825d99e07fc23630bc6aeb1c0fc (diff) | |
| parent | 569228a5df862779dbc56398a0631002d2194741 (diff) | |
Merge branch 'get-version-git-on-windows' of tsimmons/tt-rss into master
| -rw-r--r-- | include/functions.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/functions.php b/include/functions.php index 3e37d1d28..3cbdf9292 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1889,9 +1889,7 @@ date_default_timezone_set('UTC'); $root_dir = dirname(dirname(__FILE__)); - if ('\\' === DIRECTORY_SEPARATOR) { - $ttrss_version['version'] = "UNKNOWN (Unsupported, Windows)"; - } else if (PHP_OS === "Darwin") { + if (PHP_OS === "Darwin") { $ttrss_version['version'] = "UNKNOWN (Unsupported, Darwin)"; } else if (file_exists("$root_dir/version_static.txt")) { $ttrss_version['version'] = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)"; @@ -1902,7 +1900,7 @@ $cwd = getcwd(); chdir($root_dir); - exec('git --no-pager log --pretty='.escapeshellarg('version: %ct %h').' -n1 HEAD 2>&1', $output, $rc); + exec('git --no-pager log --pretty="version: %ct %h" -n1 HEAD 2>&1', $output, $rc); chdir($cwd); if (is_array($output) && count($output) > 0) { |