is a web application for booking meeting rooms or other resources (using PHP and MySQL/pgsql).
| version.inc (mrbs-1.9.4) | : | version.inc (mrbs-1.10.0) |
|---|
| | |
| skipping to change at line 20 | | skipping to change at line 20 |
|---|
| function get_mrbs_version() | | function get_mrbs_version() |
| { | | { |
| global $hg_command; | | global $hg_command; |
| global $mrbs_version_number; | | global $mrbs_version_number; |
| | |
| $mrbs_version = "MRBS $mrbs_version_number"; | | $mrbs_version = "MRBS $mrbs_version_number"; |
| | |
| if (function_exists('exec') && !function_disabled('exec')) | | if (function_exists('exec') && !function_disabled('exec')) |
| { | | { |
| // Suppress any errors because we are only interested in success | | // Suppress any errors because we are only interested in success |
|
| $hg_id_out = @exec("$hg_command id --id --branch", $output, $retval); | | $git_out = @exec("$git_command git rev-parse --abbrev-ref HEAD", $output, $r
etval); |
| | |
|
| if (($retval == 0) && (strlen($hg_id_out))) | | if (($retval == 0) && (strlen($git_out))) |
| { | | { |
|
| $mrbs_version .= "+hg ($hg_id_out)"; | | $git_out2 = @exec("$git_command git rev-parse --short HEAD", $output, $ret |
| | val); |
| | |
| | if (($retval == 0) && (strlen($git_out2))) |
| | { |
| | $mrbs_version .= "+git ($git_out $git_out2)"; |
| | } |
| } | | } |
| } | | } |
| | |
| return $mrbs_version; | | return $mrbs_version; |
| } | | } |
| | | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 9 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 