Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 14:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unified BBCode conversion, improved proxy functionality

Browse source
This commit is contained in:
Michael 2023-07-15 20:12:08 +00:00
parent 81d2d4b70e
commit 8bb33dccd1
22 changed files with 61 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Model/Event.php
View file

@ -928,7 +928,7 @@ class Event
}
// Format the event location.
$location = self::locationToArray($item['event-location']);
$location = self::locationToArray($item['event-location'], $item['uri-id']);
// Construct the profile link (magic-auth).
$author = [
@ -978,7 +978,8 @@ class Event
* Note: The string must only contain location data. A string with no bbcode will be
* handled as location name.
*
* @param string $s The string with the bbcode formatted location data.
* @param string $s The string with the bbcode formatted location data.
* @param int $uri_id The uri-id of the related post
*
* @return array The array with the location data.
* 'name' => The name of the location,<br>
@ -986,7 +987,7 @@ class Event
* 'coordinates' => Latitude and longitude (e.g. '48.864716,2.349014').<br>
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function locationToArray(string $s = ''): array
private static function locationToArray(string $s, int $uri_id): array
{
if ($s == '') {
return [];
@ -1012,7 +1013,7 @@ class Event
}
}
$location['name'] = BBCode::convert($location['name']);
$location['name'] = BBCode::convertForUriId($uri_id, $location['name']);
// Construct the map HTML.
if (isset($location['address'])) {