From f30287be652295d18e632316a66866697c26638c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 5 Dec 2019 13:23:54 +0300 Subject: versioning changes - remove VERSION_STATIC - https://community.tt-rss.org/t/versioning-changes-for-trunk/2974 - report git commit/timestamp properly by invoking git instead of trying to parse .git/HEAD etc - remove git-related global constants used when checking for updates --- classes/rpc.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/rpc.php b/classes/rpc.php index 84c9cfe92..af5bdf52c 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -590,15 +590,20 @@ class RPC extends Handler_Protected { function checkforupdates() { $rv = []; - if (CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && defined("GIT_VERSION_TIMESTAMP")) { + $git_timestamp = false; + $git_commit = false; + + get_version($git_commit, $git_timestamp); + + if (CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && $git_timestamp) { $content = @fetch_file_contents(["url" => "https://srv.tt-rss.org/version.json"]); if ($content) { $content = json_decode($content, true); if ($content && isset($content["changeset"])) { - if ((int)GIT_VERSION_TIMESTAMP < (int)$content["changeset"]["timestamp"] && - GIT_VERSION_HEAD != $content["changeset"]["id"]) { + if ($git_timestamp < (int)$content["changeset"]["timestamp"] && + $git_commit != $content["changeset"]["id"]) { $rv = $content["changeset"]; } -- cgit v1.2.3