diff --git a/.gitignore b/.gitignore index 1b58a932618a4de5ed7cea69c5b4ac23fd04787a..585abce2b3edb78d0d5e1b4aa2f0db528c23fccb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vendor/* !vendor/.htaccess +.vscode/* \ No newline at end of file diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php index ee94c7792e56776804a92ca6debbb92007fbe75c..545196bd5d07c62eb7afa8953b0315dca3cc6e86 100644 --- a/modules/Vtiger/helpers/Util.php +++ b/modules/Vtiger/helpers/Util.php @@ -182,7 +182,13 @@ class Vtiger_Util_Helper { */ if ($currentUser->get('date_format') === 'mm-dd-yyyy') { $dateInUserFormat = str_replace('-', '/', $dateInUserFormat); - } + } else if ($currentUser->get('date_format') === 'dd/mm/yyyy'){ + $dateArray = explode('/', $dateInUserFormat); + $temp = $dateArray[0]; + $dateArray[0] = $dateArray[1]; + $dateArray[1] = $temp; + $dateInUserFormat = implode('/', $dateArray); + } $date = strtotime($dateInUserFormat); $formatedDate = vtranslate('LBL_'.date('D', $date)) . ' ' . date('d', $date) . ' ' . vtranslate('LBL_'.date('M', $date));