From 9dabfbfa1163822cca7b5412e89d646b2529028f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 23 Nov 2021 14:44:48 +0300 Subject: [PATCH] _get_version: - don't bother with git if open_basedir is enabled - check for SCRIPT_ROOT instead of TTRSS_.. anything because that would be set regardless of install method --- classes/config.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/config.php b/classes/config.php index 322d2209a..95e2dd3ac 100644 --- a/classes/config.php +++ b/classes/config.php @@ -308,6 +308,8 @@ class Config { $ttrss_version["version"] = "UNKNOWN (Unsupported, Darwin)"; } else if (file_exists("$root_dir/version_static.txt")) { $this->version["version"] = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)"; + } else if (ini_get("open_basedir")) { + $this->version["version"] .= "UNKNOWN (Unsupported, open_basedir)"; } else if (is_dir("$root_dir/.git")) { $this->version = self::get_version_from_git($root_dir); @@ -315,7 +317,7 @@ class Config { user_error("Unable to determine version: " . $this->version["version"], E_USER_WARNING); $this->version["version"] = "UNKNOWN (Unsupported, Git error)"; - } else if (!getenv("TTRSS_SELF_URL_PATH") || !file_exists("/.dockerenv")) { + } else if (!getenv("SCRIPT_ROOT") || !file_exists("/.dockerenv")) { $this->version["version"] .= " (Unsupported)"; }