valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Prevent "Undefined index: version" events for git version with open_basedir after 9dabfbfa11' (#57) from ltGuillaume/tt-rss:master into master 

Reviewed-on: https://git.tt-rss.org/fox/tt-rss/pulls/57
This commit is contained in:
fox 2021-12-03 07:25:06 +03:00
parent 78e82b6043 0269c7ce32
commit 6a70f5e92c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/config.php
View File

@ -309,7 +309,7 @@ class Config {
} else if (file_exists("$root_dir/version_static.txt")) { } else if (file_exists("$root_dir/version_static.txt")) {
$this->version["version"] = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)"; $this->version["version"] = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
} else if (ini_get("open_basedir")) { } else if (ini_get("open_basedir")) {
$this->version["version"] .= "UNKNOWN (Unsupported, open_basedir)"; $this->version["version"] = "UNKNOWN (Unsupported, open_basedir)";
} else if (is_dir("$root_dir/.git")) { } else if (is_dir("$root_dir/.git")) {
$this->version = self::get_version_from_git($root_dir); $this->version = self::get_version_from_git($root_dir);