Skip to content
Snippets Groups Projects
Commit 12915e8b authored by Uma's avatar Uma
Browse files

Merge branch 'signature_warning' into 'master'

Fixes #1284 Method signature warning is addressed

See merge request !624
parents 29333abe 1552a3de
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......
......@@ -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.*,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment