diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-03 17:09:05 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-03 17:09:05 -0800 |
| commit | ca55bbdaed8c361fe9203c9823b67dd91f3b7741 (patch) | |
| tree | f8ca3246f3d9e4934ea0791f44ad27afa5deeb51 | |
| parent | 366e735ad87c30cf6562e496e3e6a158148a035e (diff) | |
| download | volse-hubzilla-ca55bbdaed8c361fe9203c9823b67dd91f3b7741.tar.gz volse-hubzilla-ca55bbdaed8c361fe9203c9823b67dd91f3b7741.tar.bz2 volse-hubzilla-ca55bbdaed8c361fe9203c9823b67dd91f3b7741.zip | |
use the std_version where applicable instead of matching to the git.
| -rw-r--r-- | include/network.php | 10 | ||||
| -rw-r--r-- | mod/siteinfo.php | 4 |
2 files changed, 7 insertions, 7 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 = ''; diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 4c5782abe..52d014de1 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -1,8 +1,6 @@ <?php function siteinfo_init(&$a) { - - if (argv(1) === 'json') { $data = get_site_info(); json_return_and_die($data); @@ -17,7 +15,7 @@ function siteinfo_content(&$a) { $version = sprintf( t('Version %s'), RED_VERSION ); if(@is_dir('.git') && function_exists('shell_exec')) { $commit = @shell_exec('git log -1 --format="%h"'); - $tag = @shell_exec('git describe --tags --abbrev=0'); + $tag = get_std_version(); // @shell_exec('git describe --tags --abbrev=0'); } if(! isset($commit) || strlen($commit) > 16) $commit = ''; |