diff --git a/include/fields/DateTimeField.php b/include/fields/DateTimeField.php index 743db77a5ba80d5f697cd59e302e2ba356b0d076..b5c271bb60b5e0d3b2fbee459207d35111a79d4c 100644 --- a/include/fields/DateTimeField.php +++ b/include/fields/DateTimeField.php @@ -165,7 +165,7 @@ class DateTimeField { } elseif ($format == 'yyyy-mm-dd') { $date[0] = $y . '-' . $m . '-' . $d; } - if ($date[1] != '') { + if (isset($date[1]) && $date[1] != '') { $userDate = $date[0] . ' ' . $date[1]; } else { $userDate = $date[0]; @@ -252,7 +252,7 @@ class DateTimeField { $log->debug("Entering getDisplayDate(" . $this->datetime . ") method ..."); $date_value = explode(' ',$this->datetime); - if ($date_value[1] != '') { + if (isset($date_value[1]) && $date_value[1] != '') { $date = self::convertToUserTimeZone($this->datetime, $user); $date_value = $date->format('Y-m-d'); } diff --git a/modules/Vtiger/models/MenuStructure.php b/modules/Vtiger/models/MenuStructure.php index 24ee659291c32a1daaad28284f2d07e4f520b5cf..d5ed017e74c5294f905461a498b4ed463021aad5 100644 --- a/modules/Vtiger/models/MenuStructure.php +++ b/modules/Vtiger/models/MenuStructure.php @@ -84,10 +84,10 @@ class Vtiger_MenuStructure_Model extends Vtiger_Base_Model { } if(!empty($selectedMenu) && !array_key_exists($selectedMenu, $menuListArray[self::TOP_MENU_INDEX])) { - $selectedMenuModel = $menuModelList[$selectedMenu]; - if($selectedMenuModel) { + if(isset($menuModelList[$selectedMenu])){ + $selectedMenuModel = $menuModelList[$selectedMenu]; $menuListArray[self::TOP_MENU_INDEX][$selectedMenuModel->get('name')] = $selectedMenuModel; - } + } } // Apply custom comparator diff --git a/modules/Vtiger/uitypes/Date.php b/modules/Vtiger/uitypes/Date.php index f8c9cc5442fec6878580e0aeecafd1de05086e24..58c28cad6f3d0b289123ceaa9d49dec7a3a6fa68 100644 --- a/modules/Vtiger/uitypes/Date.php +++ b/modules/Vtiger/uitypes/Date.php @@ -23,7 +23,7 @@ class Vtiger_Date_UIType extends Vtiger_Base_UIType { * @param <Object> $value * @return <Object> */ - public function getDisplayValue($value) { + public function getDisplayValue($value, $record=false, $recordInstance=false) { if(empty($value)){ return $value; } else { diff --git a/pkg/vtiger/modules/PBXManager/modules/PBXManager/PBXManager.php b/pkg/vtiger/modules/PBXManager/modules/PBXManager/PBXManager.php index d59955d2f90f1dada8a39a54cffcddb1daa6bbee..17c7d39ba8934dbfaf5a66b05705edce49f05335 100644 --- a/pkg/vtiger/modules/PBXManager/modules/PBXManager/PBXManager.php +++ b/pkg/vtiger/modules/PBXManager/modules/PBXManager/PBXManager.php @@ -319,7 +319,7 @@ class PBXManager extends CRMEntity { $log->fatal('MakeOutgoingCalls ActionName Removed'); } - static function checkLinkPermission($linkData){ + public static function checkLinkPermission($linkData){ $module = new Vtiger_Module(); $moduleInstance = $module->getInstance('PBXManager'); diff --git a/vtlib/Vtiger/Deprecated.php b/vtlib/Vtiger/Deprecated.php index 594fa23c36a5dc7fd956cd0580229b4828631029..d5847e46d21519bb37fd6708ab11153dee50fa78 100644 --- a/vtlib/Vtiger/Deprecated.php +++ b/vtlib/Vtiger/Deprecated.php @@ -295,6 +295,7 @@ class Vtiger_Deprecated { static function getAnnouncements() { global $adb; + $announcement = ''; $sql = " select * from vtiger_announcement inner join vtiger_users on vtiger_announcement.creatorid=vtiger_users.id"; $sql.=" AND vtiger_users.is_admin='on' AND vtiger_users.status='Active' AND vtiger_users.deleted = 0"; $result = $adb->pquery($sql, array());