From dbba584dfbdcccd35870fbd378ef7c076ac5e61e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 22 Nov 2024 09:19:12 +0100
Subject: [PATCH] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/adherents/class/adherent.class.php | 2 +-
 htdocs/contact/class/contact.class.php    | 2 +-
 htdocs/contact/list.php                   | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index e2353b82af6..7ad5ee54ee7 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -3300,7 +3300,7 @@ class Adherent extends CommonObject
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';
 		if (property_exists($this, 'photo') || !empty($this->photo)) {
-			$return .= Form::showphoto('memberphoto', $this, 0, 60, 0, 'photokanban photoref photowithmargin photologintooltip', 'small', 0, 1);
+			$return .= Form::showphoto('memberphoto', $this, 0, 60, 0, 'photokanban photowithmargin photologintooltip', 'small', 0, 1);
 		} else {
 			$return .= img_picto('', 'user');
 		}
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 9af01fe74ce..5fc553e9994 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1531,7 +1531,7 @@ class Contact extends CommonObject
 	 *  @param  	string  	$morecss            		Add more css on link
 	 *	@return		string									String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $moreparam = '', $save_lastsearch_value = -1, $notooltip = 0, $morecss = '')
+	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $moreparam = '', $save_lastsearch_value = -1, $notooltip = 0, $morecss = 'valignmiddle')
 	{
 		global $conf, $langs, $hookmanager;
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 0d971f01723..ae6fd816681 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -166,26 +166,22 @@ if ($type == "p") {
 		$contextpage = 'contactprospectlist';
 	}
 	$title .= '  ('.$langs->trans("ThirdPartyProspects").')';
-	$urlfiche = "card.php";
 }
 if ($type == "c") {
 	if (empty($contextpage) || $contextpage == 'contactlist') {
 		$contextpage = 'contactcustomerlist';
 	}
 	$title .= '  ('.$langs->trans("ThirdPartyCustomers").')';
-	$urlfiche = "card.php";
 } elseif ($type == "f") {
 	if (empty($contextpage) || $contextpage == 'contactlist') {
 		$contextpage = 'contactsupplierlist';
 	}
 	$title .= ' ('.$langs->trans("ThirdPartySuppliers").')';
-	$urlfiche = "card.php";
 } elseif ($type == "o") {
 	if (empty($contextpage) || $contextpage == 'contactlist') {
 		$contextpage = 'contactotherlist';
 	}
 	$title .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
-	$urlfiche = "";
 }
 
 // Initialize a technical object
@@ -1453,7 +1449,6 @@ while ($i < $imaxinloop) {
 		}
 	} else {
 		// Show here line of result
-		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven"';
 		if ($contextpage == 'poslist') {
 			print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->socid.'&idcontact='.$obj->rowid.'&place='.urlencode($place).'\'"';