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

Replace share_header calls with BBCode::getShareOpeningTag

This commit is contained in:
Hypolite Petovan 2020-06-18 08:53:57 -04:00
parent cd74fb8609
commit 1f20111c80
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/api.php
View File

@ -2043,7 +2043,7 @@ function api_statuses_repeat($type)
$pos = strpos($item['body'], "[share"); $pos = strpos($item['body'], "[share");
$post = substr($item['body'], $pos); $post = substr($item['body'], $pos);
} else { } else {
$post = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']); $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
if (!empty($item['title'])) { if (!empty($item['title'])) {
$post .= '[h3]' . $item['title'] . "[/h3]\n"; $post .= '[h3]' . $item['title'] . "[/h3]\n";

3
mod/share.php
View File

@ -20,6 +20,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Item; use Friendica\Model\Item;
@ -42,7 +43,7 @@ function share_init(App $a) {
$pos = strpos($item['body'], "[share"); $pos = strpos($item['body'], "[share");
$o = substr($item['body'], $pos); $o = substr($item['body'], $pos);
} else { } else {
$o = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']); $o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
if ($item['title']) { if ($item['title']) {
$o .= '[h3]'.$item['title'].'[/h3]'."\n"; $o .= '[h3]'.$item['title'].'[/h3]'."\n";

2
src/Protocol/ActivityPub/Transmitter.php
View File

@ -863,7 +863,7 @@ class Transmitter
$type = 'Announce'; $type = 'Announce';
// Disguise forum posts as reshares. Will later be converted to a real announce // Disguise forum posts as reshares. Will later be converted to a real announce
$item['body'] = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['body'] = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
$item['guid'], $item['created'], $item['plink']) . $item['body'] . '[/share]'; $item['guid'], $item['created'], $item['plink']) . $item['body'] . '[/share]';
} }
} }

4
src/Protocol/Diaspora.php
View File

@ -2795,7 +2795,7 @@ class Diaspora
/// @todo Copy tag data from original post /// @todo Copy tag data from original post
$prefix = share_header( $prefix = BBCode::getShareOpeningTag(
$original_item["author-name"], $original_item["author-name"],
$original_item["author-link"], $original_item["author-link"],
$original_item["author-avatar"], $original_item["author-avatar"],
@ -3676,7 +3676,7 @@ class Diaspora
if ($item['author-link'] != $item['owner-link']) { if ($item['author-link'] != $item['owner-link']) {
require_once 'mod/share.php'; require_once 'mod/share.php';
$body = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $body = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
"", $item['created'], $item['plink']) . $body . '[/share]'; "", $item['created'], $item['plink']) . $body . '[/share]';
} }