diff options
| author | RedMatrix <info@friendica.com> | 2015-02-21 08:26:31 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2015-02-21 08:26:31 +1100 |
| commit | 912c9fdd58b738d1d83421d34bfc51265e8ab934 (patch) | |
| tree | 0b10e15a3f3e7a47be78d48326fa891fc8408f94 | |
| parent | 8eedc9d5766df8d57815bdd38e5fa5e3757e7555 (diff) | |
| parent | 2765500844d7c85a6921f26cc708af8d967c9125 (diff) | |
| download | volse-hubzilla-912c9fdd58b738d1d83421d34bfc51265e8ab934.tar.gz volse-hubzilla-912c9fdd58b738d1d83421d34bfc51265e8ab934.tar.bz2 volse-hubzilla-912c9fdd58b738d1d83421d34bfc51265e8ab934.zip | |
Merge pull request #907 from tuscanhobbit/dev
Added version tag to siteinfo/json
| -rw-r--r-- | mod/siteinfo.php | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 1f3cd4479..e6798ce50 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -50,6 +50,18 @@ function siteinfo_init(&$a) { $site_info = get_config('system','info'); $site_name = get_config('system','sitename'); + if(! get_config('system','hidden_version_siteinfo')) { + $version = RED_VERSION; + if(@is_dir('.git') && function_exists('shell_exec')) { + $commit = trim( @shell_exec('git log -1 --format="%h"')); + $tag = trim( @shell_exec('git describe --tags --abbrev=0')); + } + if(! isset($commit) || strlen($commit) > 16) + $commit = ''; + } + else { + $version = $commit = ''; + } //Statistics $channels_total_stat = intval(get_config('system','channels_total_stat')); @@ -59,7 +71,8 @@ function siteinfo_init(&$a) { $hide_in_statistics = intval(get_config('system','hide_in_statistics')); $data = Array( - 'version' => RED_VERSION, + 'version' => $version, + 'version_tag' => $tag, 'commit' => $commit, 'url' => z_root(), 'plugins' => $visible_plugins, |