From ce7f192f35cb0493c96283fac701d51bd30dc777 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 31 Jul 2020 04:28:26 +0000
Subject: [PATCH] "id" is not needed as a parameter

---
 mod/common.php            | 4 +---
 mod/match.php             | 2 +-
 mod/suggest.php           | 4 +---
 src/Module/AllFriends.php | 4 +---
 src/Module/BaseSearch.php | 3 +--
 src/Module/Contact.php    | 3 +--
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/mod/common.php b/mod/common.php
index edcb81983f..7d9caf8d1e 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -117,13 +117,11 @@ function common_content(App $a)
 		return $o;
 	}
 
-	$id = 0;
-
 	$entries = [];
 	foreach ($common_friends as $common_friend) {
 		$contact = Model\Contact::getByURLForUser($common_friend['url'], local_user());
 		if (!empty($contact)) {
-			$entries[] = Module\Contact::getContactTemplateVars($contact, ++$id);
+			$entries[] = Module\Contact::getContactTemplateVars($contact);
 		}
 	}
 
diff --git a/mod/match.php b/mod/match.php
index 6a2e350bcc..8e0baacd1e 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -94,7 +94,7 @@ function match_content(App $a)
 
 			$contact = Contact::getByURLForUser($profile->url, local_user());
 			if (!empty($contact)) {
-				$entries[] = ModuleContact::getContactTemplateVars($contact, $i);
+				$entries[] = ModuleContact::getContactTemplateVars($contact);
 			}
 		}
 
diff --git a/mod/suggest.php b/mod/suggest.php
index 03d0e77fc7..d501e3a3f2 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -89,11 +89,9 @@ function suggest_content(App $a)
 		]);
 	}
 
-	$id = 0;
 	$entries = [];
-
 	foreach ($contacts as $contact) {
-		$entries[] = ModuleContact::getContactTemplateVars($contact, ++$id);
+		$entries[] = ModuleContact::getContactTemplateVars($contact);
 	}
 
 	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 30418f5c2a..68a4f304e6 100644
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -72,13 +72,11 @@ class AllFriends extends BaseModule
 			return DI::l10n()->t('No friends to display.');
 		}
 
-		$id = 0;
-
 		$entries = [];
 		foreach ($friends as $friend) {
 			$contact = Model\Contact::getByURLForUser($friend['url'], local_user());
 			if (!empty($contact)) {
-				$entries[] = Contact::getContactTemplateVars($contact, ++$id);
+				$entries[] = Contact::getContactTemplateVars($contact);
 			}
 		}
 
diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index 5863a94050..77abae007a 100644
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -118,7 +118,6 @@ class BaseSearch extends BaseModule
 			return '';
 		}
 
-		$id      = 0;
 		$entries = [];
 		foreach ($results->getResults() as $result) {
 
@@ -126,7 +125,7 @@ class BaseSearch extends BaseModule
 			if ($result instanceof ContactResult) {
 				$contact = Model\Contact::getByURLForUser($result->getUrl(), local_user());
 				if (!empty($contact)) {
-					$entries[] = Contact::getContactTemplateVars($contact, ++$id);
+					$entries[] = Contact::getContactTemplateVars($contact);
 				}
 			}
 		}
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 2d06aa3240..310bf8029b 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -1016,7 +1016,7 @@ class Contact extends BaseModule
 	 * @param integer $id
 	 * @return array Template fields
 	 */
-	public static function getContactTemplateVars(array $rr, int $id = 0)
+	public static function getContactTemplateVars(array $rr)
 	{
 		$dir_icon = '';
 		$alt_text = '';
@@ -1085,7 +1085,6 @@ class Contact extends BaseModule
 			'url'       => $url,
 			'network'   => ContactSelector::networkToName($rr['network'], $rr['url'], $rr['protocol']),
 			'nick'      => $rr['nick'],
-			'id'        => $id,
 		];
 	}