clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12215 from MrPetovan/bug/hovercard-url 

Fix support for `/contact/redir` URLs in Module\Contact\Hovercard
This commit is contained in:
Philipp 2022-11-19 19:53:38 +01:00 committed by GitHub
parent e084dd964b de5097b772
commit 643d18b108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Module/Contact/Hovercard.php
View File

@ -47,20 +47,11 @@ class Hovercard extends BaseModule
// If a contact is connected the url is internally changed to 'contact/redir/CID'. We need the pure url to search for // 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 contact. So we strip out the contact id from the internal url and look in the contact table for
// the real url (nurl) // the real url (nurl)
if (strpos($contact_url, 'contact/redir/') === 0) { if (strpos($contact_url, 'contact/') === 0) {
$cid = intval(substr($contact_url, 6)); $remote_contact = Contact::selectFirst(['nurl'], ['id' => intval(basename($contact_url))]);
} elseif (strpos($contact_url, 'contact/') === 0) {
$cid = intval(substr($contact_url, 8));
}
if (!empty($cid)) {
$remote_contact = Contact::selectFirst(['nurl'], ['id' => $cid]);
$contact_url = $remote_contact['nurl'] ?? ''; $contact_url = $remote_contact['nurl'] ?? '';
} }
$contact = [];
// if it's the url containing https it should be converted to http
if (!$contact_url) { if (!$contact_url) {
throw new HTTPException\BadRequestException(); throw new HTTPException\BadRequestException();
} }