diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-17 16:29:32 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-17 16:29:32 -0800 |
| commit | 10ed334e8c81d1db4a506716b78ece13dc69266c (patch) | |
| tree | 79a610615bbd6aacff90ff800cad0e08649c8407 /include/network.php | |
| parent | 9b3b2efe9aa374565c0c67bbc67c36f9c99d3add (diff) | |
| download | volse-hubzilla-10ed334e8c81d1db4a506716b78ece13dc69266c.tar.gz volse-hubzilla-10ed334e8c81d1db4a506716b78ece13dc69266c.tar.bz2 volse-hubzilla-10ed334e8c81d1db4a506716b78ece13dc69266c.zip | |
various issues from the forums
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/network.php b/include/network.php index 94298abef..2e34bd7ff 100644 --- a/include/network.php +++ b/include/network.php @@ -1767,16 +1767,13 @@ function get_site_info() { $site_info = get_config('system','info'); $site_name = get_config('system','sitename'); if(! get_config('system','hidden_version_siteinfo')) { - $version = RED_VERSION; + $version = get_project_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(! isset($commit) || strlen($commit) > 16) $commit = ''; } @@ -1820,7 +1817,7 @@ function get_site_info() { 'locked_features' => $locked_features, 'admin' => $admin, 'site_name' => (($site_name) ? $site_name : ''), - 'platform' => PLATFORM_NAME, + 'platform' => get_platform_name(), 'dbdriver' => $db->getdriver(), 'lastpoll' => get_config('system','lastpoll'), 'info' => (($site_info) ? $site_info : ''), |