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

Merge pull request #8631 from MrPetovan/task/remove-item-tag-field 

Remove references to obsolete virtual tag item.tag
This commit is contained in:
Michael Vogel 2020-05-14 06:29:46 +02:00 committed by GitHub
parent 4a529b7125 c2a76db290
commit cc8491223e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 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 (!empty($contact)) {
$taginfo[] = [$newname, $profile, $notify, $contact, '@[url=' . str_replace(',', '%2c', $profile) . ']' . $newname . '[/url]'];
$taginfo[] = [$newname, $profile, $notify, $contact];
} else {
$taginfo[] = [$newname, $profile, $notify, null, '@[url=' . $profile . ']' . $newname . '[/url]'];
$taginfo[] = [$newname, $profile, $notify, null];
}
$profile = str_replace(',', '%2c', $profile);
@ -579,7 +579,6 @@ function photos_post(App $a)
$arr['gravity'] = GRAVITY_PARENT;
$arr['object-type'] = Activity\ObjectType::PERSON;
$arr['target-type'] = Activity\ObjectType::IMAGE;
$arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2];
$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]') ;

6
src/Model/Tag.php
View File

@ -366,12 +366,14 @@ class Tag
* Return a string with all tags and mentions
*
* @param integer $uri_id
* @param array $type
* @return string tags and mentions
* @throws \Exception
*/
public static function getCSVByURIId(int $uri_id)
public static function getCSVByURIId(int $uri_id, array $type = [self::HASHTAG, self::MENTION, self::IMPLICIT_MENTION, self::EXCLUSIVE_MENTION])
{
$tag_list = [];
$tags = self::getByURIId($uri_id);
$tags = self::getByURIId($uri_id, $type);
foreach ($tags as $tag) {
$tag_list[] = self::TAG_CHARACTER[$tag['type']] . '[url=' . $tag['url'] . ']' . $tag['name'] . '[/url]';
}

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

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