From b723d2c2d2604cfd513de68ea8a958f37bbf406d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Sep 2017 01:39:22 +0200
Subject: [PATCH] Fix scrutinizer bugs

---
 htdocs/core/actions_massactions.inc.php | 4 ++--
 htdocs/core/lib/agenda.lib.php          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index b17c047860a..2ac0b3a5885 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -147,11 +147,11 @@ if (! $error && $massaction == 'confirm_presend')
             	foreach($receiver as $key=>$val)
             	{
             		// Recipient was provided from combo list
-            		if ($val == 'thirdparty') // Id of third party
+            		if ($val == 'thirdparty') // Id of third party or user
             		{
             			$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
             		}
-            		elseif ($val)	// Id du contact
+            		elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
             		{
             			$tmparray[] = $thirdparty->contact_get_property((int) $val,'email');
             			$sendtoid[] = $val;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index a1571f7ac08..526e6386f0f 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -54,6 +54,9 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
 	$langs->load("companies");
 
+	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	$formactions=new FormActions($db);
+
 	// Filters
 	print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
 	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
@@ -95,9 +98,6 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
     		print '</td></tr>';
 		}
 
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-		$formactions=new FormActions($db);
-
 		// Type
 		print '<tr>';
 		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';