From 83c04ac433a706d19433e819529b0a3b23640443 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 19 Nov 2022 19:41:45 -0500 Subject: [PATCH] Fix support for `/contact/123456/conversations` URLs in Module\Contact\Hovercard --- src/Module/Contact/Hovercard.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php index 953d7e7a7f..5c82fd2c42 100644 --- a/src/Module/Contact/Hovercard.php +++ b/src/Module/Contact/Hovercard.php @@ -44,11 +44,12 @@ class Hovercard extends BaseModule throw new HTTPException\ForbiddenException(); } - // If a contact is connected the url is internally changed to 'contact/redir/CID'. We need the pure url to search for - // the contact. So we strip out the contact id from the internal url and look in the contact table for - // the real url (nurl) - if (strpos($contact_url, 'contact/') === 0) { - $remote_contact = Contact::selectFirst(['nurl'], ['id' => intval(basename($contact_url))]); + /* Possible formats for relative URLs that need to be converted to the absolute contact URL: + * - contact/redir/123456 + * - contact/123456/conversations + */ + if (strpos($contact_url, 'contact/') === 0 && preg_match('/(\d+)/', $contact_url, $matches)) { + $remote_contact = Contact::selectFirst(['nurl'], ['id' => $matches[1]]); $contact_url = $remote_contact['nurl'] ?? ''; }