diff options
| author | fox <[email protected]> | 2023-04-06 19:58:03 +0000 |
|---|---|---|
| committer | fox <[email protected]> | 2023-04-06 19:58:03 +0000 |
| commit | ae27d51197ec4bc9f087661ea1fd1d9a57b51f7d (patch) | |
| tree | 4bf01dad2fa711e6d9a6f0e8b71450dba67e9f09 | |
| parent | 0fcc2d1d662fcbc79ac341f075ae308f69665719 (diff) | |
| parent | a60c833ee4ad394c681b87b083c91187c3c25d38 (diff) | |
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
| -rw-r--r-- | classes/config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/config.php b/classes/config.php index a865266ca..dee6caa38 100644 --- a/classes/config.php +++ b/classes/config.php @@ -316,7 +316,7 @@ class Config { $this->version["status"] = -1; 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")) { $this->version["version"] = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)"; } else if (ini_get("open_basedir")) { |