From 475adb6b9dd2fbb29299bebdd5c7f95f6379a44b Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Fri, 23 Jul 2021 13:12:06 +0530
Subject: [PATCH] Fixes #1630 Migration issue to update userlabel fixed
---
modules/Migration/schema/730_to_740.php | 2 +-
modules/Migration/schema/73_to_740.php | 2 +-
vtigerversion.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/Migration/schema/730_to_740.php b/modules/Migration/schema/730_to_740.php
index 4ed57ff16..462cfa950 100644
--- a/modules/Migration/schema/730_to_740.php
+++ b/modules/Migration/schema/730_to_740.php
@@ -38,7 +38,7 @@ if (defined('VTIGER_UPGRADE')) {
$entityFields = Vtiger_Functions::getEntityModuleInfo($moduleName);
$entityFieldNames = explode(',', $entityFields['fieldname']);
- $sql = "UPDATE vtiger_users SET $fieldName = TRIM(CONCAT(".implode(' ', $entityFieldNames)."))";
+ $sql = "UPDATE vtiger_users SET $fieldName = TRIM(CONCAT_WS(' ',".implode(',', $entityFieldNames)."))";
$db->pquery($sql, array());
Vtiger_Access::syncSharingAccess();
diff --git a/modules/Migration/schema/73_to_740.php b/modules/Migration/schema/73_to_740.php
index 135db960a..76d1493b1 100644
--- a/modules/Migration/schema/73_to_740.php
+++ b/modules/Migration/schema/73_to_740.php
@@ -10,4 +10,4 @@
//7.3_to_7.4.0 (to overcome 730 package glitch, where DB version set to 7.3 instead 7.3.0)
-include_once dirname(__FILE__)."730_to_740.php";
\ No newline at end of file
+include_once dirname(__FILE__)."/730_to_740.php";
\ No newline at end of file
diff --git a/vtigerversion.php b/vtigerversion.php
index 8c9b6a4e2..9ffc9bd3b 100644
--- a/vtigerversion.php
+++ b/vtigerversion.php
@@ -8,7 +8,7 @@
* All Rights Reserved.
************************************************************************************/
-$patch_version = '20210721'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '20210723'; // -ve timestamp before release, +ve timestamp after release.
$modified_database = '';
$vtiger_current_version = '7.4.0';
$_SESSION['vtiger_version'] = $vtiger_current_version;
--
GitLab