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 /mod | |
| 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 'mod')
| -rw-r--r-- | mod/invite.php | 2 | ||||
| -rw-r--r-- | mod/siteinfo.php | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mod/invite.php b/mod/invite.php index bda808142..1af5fc1f8 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -51,7 +51,7 @@ function invite_post(&$a) { } if($invonly && ($x || is_site_admin())) { - $code = autoname(8) . srand(1000,9999); + $code = autoname(8) . rand(1000,9999); $nmessage = str_replace('$invite_code',$code,$message); $r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ", 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 = ''; |