From 1552a3ded5325b7fa46e4bca5d978a77525e9a5d Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Wed, 20 May 2020 20:51:09 +0530
Subject: [PATCH] Fixes #1284 Method signature warning is addressed
---
layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl | 2 +-
modules/Calendar/Activity.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl b/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
index f31d65647..a1c4d57bd 100644
--- a/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
+++ b/layouts/v7/modules/Vtiger/partials/RelatedListHeader.tpl
@@ -14,7 +14,7 @@
{foreach item=RELATED_LINK from=$RELATED_LIST_LINKS['LISTVIEWBASIC']}
<div class="btn-group">
{assign var=DROPDOWNS value=$RELATED_LINK->get('linkdropdowns')}
- {if count($DROPDOWNS) gt 0}
+ {if !empty($DROPDOWNS) && (count($DROPDOWNS) gt 0)}
<a class="btn dropdown-toggle" href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="200" data-close-others="false" style="width:20px;height:18px;">
<img title="{$RELATED_LINK->getLabel()}" alt="{$RELATED_LINK->getLabel()}" src="{vimage_path("{$RELATED_LINK->getIcon()}")}">
</a>
diff --git a/modules/Calendar/Activity.php b/modules/Calendar/Activity.php
index c30f3b0f0..5ebf5fe05 100644
--- a/modules/Calendar/Activity.php
+++ b/modules/Calendar/Activity.php
@@ -572,7 +572,7 @@ function insertIntoRecurringTable(& $recurObj)
* @param string $criteria - query string
* returns activity records in array format($list) or null value
*/
- function get_full_list($criteria) {
+ function get_full_list($criteria='', $where='') {
global $log;
$log->debug("Entering get_full_list(".$criteria.") method ...");
$query = "select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*,
--
GitLab