strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove remaining references to cirtual field item.tag

Browse source
This commit is contained in:
Hypolite Petovan 2020-05-13 22:35:13 -04:00
parent ba9d5b83e4
commit 75977ee72b
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mod/photos.php
View file

@ -509,9 +509,9 @@ function photos_post(App $a)
if ($profile) { if ($profile) {
if (!empty($contact)) { if (!empty($contact)) {
$taginfo[] = [$newname, $profile, $notify, $contact, '@[url=' . str_replace(',', '%2c', $profile) . ']' . $newname . '[/url]']; $taginfo[] = [$newname, $profile, $notify, $contact];
} else { } else {
$taginfo[] = [$newname, $profile, $notify, null, '@[url=' . $profile . ']' . $newname . '[/url]']; $taginfo[] = [$newname, $profile, $notify, null];
} }
$profile = str_replace(',', '%2c', $profile); $profile = str_replace(',', '%2c', $profile);
@ -579,7 +579,6 @@ function photos_post(App $a)
$arr['gravity'] = GRAVITY_PARENT; $arr['gravity'] = GRAVITY_PARENT;
$arr['object-type'] = Activity\ObjectType::PERSON; $arr['object-type'] = Activity\ObjectType::PERSON;
$arr['target-type'] = Activity\ObjectType::IMAGE; $arr['target-type'] = Activity\ObjectType::IMAGE;
$arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2]; $arr['inform'] = $tagged[2];
$arr['origin'] = 1; $arr['origin'] = 1;
$arr['body'] = DI::l10n()->t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . DI::l10n()->t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ; $arr['body'] = DI::l10n()->t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . DI::l10n()->t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;

10
src/Module/Debug/Babel.php
View file

@ -26,6 +26,7 @@ use Friendica\Content\Text;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Tag;
use Friendica\Util\XML; use Friendica\Util\XML;
/** /**
@ -101,10 +102,9 @@ class Babel extends BaseModule
'content' => visible_whitespace($bbcode4) 'content' => visible_whitespace($bbcode4)
]; ];
$item = [ $item = ['body' => $bbcode];
'body' => $bbcode,
'tag' => '', $tags = Text\BBCode::getTags($bbcode);
];
Item::setHashtags($item); Item::setHashtags($item);
$results[] = [ $results[] = [
@ -113,7 +113,7 @@ class Babel extends BaseModule
]; ];
$results[] = [ $results[] = [
'title' => DI::l10n()->t('Item Tags'), 'title' => DI::l10n()->t('Item Tags'),
'content' => $item['tag'] 'content' => visible_whitespace(var_export($tags, true)),
]; ];
break; break;
case 'diaspora': case 'diaspora':