TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
move shared post formatting to its own tpl

See merge request hubzilla/core!2248
This commit is contained in:
Mario
2026-01-04 19:36:06 +00:00
parent b6a58fbf6e 9f98f6bbd5
commit 1323ea8e18
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/bbcode.php
View File

@@ -552,13 +552,6 @@ function bb_ShareAttributes($match) {
$rnd = mt_rand();
$reldate = '<span class="autotime" title="' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'c') . '" >' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'r') . '</span>';
$headline = '<div id="shared_container_' . $rnd . '" class="shared_container"> <div id="shared_header_' . $rnd . '" class="shared_header">';
if ($avatar != "")
$headline .= '<a href="' . (($auth) ? zid($profile) : $profile) . '" ><img src="' . $avatar . '" alt="' . $author . '" height="32" width="32" loading="lazy" /></a>';
if(strpos($link,'/cards/'))
$type = t('card');
elseif(strpos($link,'/articles/'))
@@ -566,19 +559,23 @@ function bb_ShareAttributes($match) {
else
$type = t('post');
// Bob Smith wrote the following post 2 hours ago
$author_url = (($auth) ? zid($profile) : $profile);
$post_url = (($auth) ? zid($link) : $link);
$reldate = datetime_convert('UTC', date_default_timezone_get(), $posted, 'r');
$reldate_iso = datetime_convert('UTC', date_default_timezone_get(), $posted, 'c');
$fmt = sprintf( t('%1$s wrote the following %2$s %3$s'),
'<a href="' . (($auth) ? zid($profile) : $profile) . '" ><bdi>' . $author . '</bdi></a>',
'<a href="' . (($auth) ? zid($link) : $link) . '" >' . $type . '</a>',
$reldate
);
$headline .= '<span>' . $fmt . '</span></div>';
$text = $headline . '<div id="reshared-content-' . $rnd . '" class="reshared-content">' . trim($match[2]) . '</div></div>';
return $text;
return replace_macros(get_markup_template('bb_share.tpl'), [
'$rnd' => $rnd,
'$avatar' => $avatar,
'$text' => t(' wrote the following '),
'$author' => $author,
'$author_url' => $author_url,
'$post_url' => $post_url,
'$type' => $type,
'$reldate' => $reldate,
'$reldate_iso' => $reldate_iso,
'$content' => trim($match[2]),
]);
}
function bb_location($match) {