From c9be2e00115c3005aceaddb2c8bf3aeaa6485f5a Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Wed, 2 Oct 2019 14:59:32 -0500
Subject: [PATCH] issue: Revert fefed14
This addresses issue 5084 by partially reverting commit `fefed14`. 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.
---
include/cli/modules/deploy.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/cli/modules/deploy.php b/include/cli/modules/deploy.php
index f9eb912af..eb76a165f 100644
--- a/include/cli/modules/deploy.php
+++ b/include/cli/modules/deploy.php
@@ -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;
--
GitLab