Browse Source

In get_version() disable DIRECTORY_SEPARATOR check, permit using git on Windows to get version details;

Toby Simmons 5 months ago
parent
commit
569228a5df
1 changed files with 2 additions and 4 deletions
  1. 2 4
      include/functions.php

+ 2 - 4
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) {