diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2015-03-22 16:34:40 +0100 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2015-03-22 16:34:40 +0100 |
| commit | 82fb1ca0caaae72b77b641d22e51d5ae1b188183 (patch) | |
| tree | a2ecee4e65bc80300c62b5b327965b8118117ad3 /mod/siteinfo.php | |
| parent | ff5c3b009fa25e87e294cd458d3de4b677270c64 (diff) | |
| parent | e345d6793d5f6910dd230f661ca5d1a837b1b504 (diff) | |
| download | volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.tar.gz volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.tar.bz2 volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.zip | |
Merge pull request #8 from friendica/master
merging red master into nuvola.red
Diffstat (limited to 'mod/siteinfo.php')
| -rw-r--r-- | mod/siteinfo.php | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 1f3cd4479..2ad9f7cde 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -50,6 +50,21 @@ 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"')); + if(! get_config('system','hidden_tag_siteinfo')) + $tag = trim( @shell_exec('git describe --tags --abbrev=0')); + else + $tag = ''; + } + if(! isset($commit) || strlen($commit) > 16) + $commit = ''; + } + else { + $version = $commit = ''; + } //Statistics $channels_total_stat = intval(get_config('system','channels_total_stat')); @@ -59,7 +74,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, |