Skip to content
Snippets Groups Projects
Commit c9be2e00 authored by JediKev's avatar JediKev
Browse files

issue: Revert fefed147

This addresses issue 5084 by partially reverting commit `fefed147`. In said
commit, we updated `THIS_VERSION` to utilize `MAJOR_VERSION` which is fine.
However, we also updated the deploy module to copy the same format. This
interferes with the osTicket Version check by not including the entire
subversion and not starting with a `v` (ie. `v1.12.3`). This reverts the
copied format section of the commit so that `THIS_VERSION` will be the full,
non-git version when deployed/packaged.
parent bcf1a6f1
No related branches found
No related tags found
No related merge requests found
......@@ -122,7 +122,7 @@ class Deployment extends Unpacker {
}
if (!$version)
$version = preg_replace('/^v(\d{1}\.\d{2}).*$/', '$1-git', exec('git describe'));
$version = exec('git describe');
if (!$short || !$version)
return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment