diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-05 11:26:07 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-05 11:26:07 +0100 |
| commit | 7119976199f0c2cd4766a073609e6c76bdc9c30f (patch) | |
| tree | aa3f6a6bcbb96849670efad7d8a1d8e2fb972511 /include/network.php | |
| parent | dd7edc8ced15be66ebf830baaf8f909d16457d46 (diff) | |
| parent | 4428f70ea292f1800ffde39ea49732628e83f862 (diff) | |
| download | volse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.tar.gz volse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.tar.bz2 volse-hubzilla-7119976199f0c2cd4766a073609e6c76bdc9c30f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php index e906fc7cb..f386afc8e 100644 --- a/include/network.php +++ b/include/network.php @@ -1764,12 +1764,14 @@ function get_site_info() { $site_name = get_config('system','sitename'); if(! get_config('system','hidden_version_siteinfo')) { $version = RED_VERSION; + $tag = get_std_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(! get_config('system','hidden_tag_siteinfo')) +// $tag = trim( @shell_exec('git describe --tags --abbrev=0')); +// else +// $tag = ''; } if(! isset($commit) || strlen($commit) > 16) $commit = ''; |