Merge branch 'master' into 'master'
Update config.php: $ttrss_version in private function _get_version() replaced by $this->version See merge request tt-rss/tt-rss!2
This commit is contained in:
commit
ae27d51197
|
@ -316,7 +316,7 @@ class Config {
|
||||||
$this->version["status"] = -1;
|
$this->version["status"] = -1;
|
||||||
|
|
||||||
if (PHP_OS === "Darwin") {
|
if (PHP_OS === "Darwin") {
|
||||||
$ttrss_version["version"] = "UNKNOWN (Unsupported, Darwin)";
|
$this->version["version"] = "UNKNOWN (Unsupported, Darwin)";
|
||||||
} 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")) {
|
||||||
|
|
Loading…
Reference in New Issue