X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Fversion.php;h=6ca1b7fc4b190d904bc76df6cf4065663657339a;hb=25a533c432036280de057bf10ca7b673e4f4aac4;hp=34c11e6e7738a8a0495d68c3b22b1cb773a9593d;hpb=5078ebcc6f69898366679c35ac744e8a7897d585;p=tt-rss.git

diff --git a/include/version.php b/include/version.php
index 34c11e6e..6ca1b7fc 100644
--- a/include/version.php
+++ b/include/version.php
@@ -1,22 +1,41 @@
 <?php
-	define('VERSION_STATIC', '1.15.3');
+	define('VERSION_STATIC', '16.8');
 
 	function get_version() {
 		date_default_timezone_set('UTC');
 		$root_dir = dirname(dirname(__FILE__));
 
-		if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/refs/heads/master")) {
+		if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/HEAD")) {
+			$head = trim(file_get_contents("$root_dir/.git/HEAD"));
 
-			$suffix = substr(trim(file_get_contents("$root_dir/.git/refs/heads/master")), 0, 7);
-			$timestamp = filemtime("$root_dir/.git/refs/heads/master");
+			if ($head) {
+				$matches = array();
 
-			define("GIT_VERSION_HEAD", $suffix);
-			define("GIT_VERSION_TIMESTAMP", $timestamp);
+				if (preg_match("/^ref: (.*)/", $head, $matches)) {
+					$ref = $matches[1];
 
-			return VERSION_STATIC . ".$suffix";
-		} else {
-			return VERSION_STATIC;
+					$suffix = substr(trim(file_get_contents("$root_dir/.git/$ref")), 0, 7);
+					$timestamp = filemtime("$root_dir/.git/$ref");
+
+					define("GIT_VERSION_HEAD", $suffix);
+					define("GIT_VERSION_TIMESTAMP", $timestamp);
+
+					return VERSION_STATIC . " ($suffix)";
+
+				} else {
+					$suffix = substr(trim($head), 0, 7);
+					$timestamp = filemtime("$root_dir/.git/HEAD");
+
+					define("GIT_VERSION_HEAD", $suffix);
+					define("GIT_VERSION_TIMESTAMP", $timestamp);
+
+					return VERSION_STATIC . " ($suffix)";
+				}
+			}
 		}
+
+		return VERSION_STATIC;
+
 	}
 
 	define('VERSION', get_version());