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

the "term" field now is called "name", workaround removed

Browse source
This commit is contained in:
Michael 2020-05-01 15:18:48 +00:00
parent 74081a71ff
commit 729c6b67aa
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/item.php
View file

@ -1061,7 +1061,7 @@ function item_add_implicit_mentions(array $tags, array $thread_parent_contact, $
$parent_terms = Tag::getByURIId($thread_parent_uriid, [Tag::MENTION, Tag::IMPLICIT_MENTION]); $parent_terms = Tag::getByURIId($thread_parent_uriid, [Tag::MENTION, Tag::IMPLICIT_MENTION]);
foreach ($parent_terms as $parent_term) { foreach ($parent_terms as $parent_term) {
$implicit_mentions[$parent_term['url']] = $parent_term['term']; $implicit_mentions[$parent_term['url']] = $parent_term['name'];
} }
foreach ($implicit_mentions as $url => $label) { foreach ($implicit_mentions as $url => $label) {

13
src/Model/Tag.php
View file

@ -320,18 +320,7 @@ class Tag
public static function getByURIId(int $uri_id, array $type = [self::HASHTAG, self::MENTION, self::IMPLICIT_MENTION, self::EXCLUSIVE_MENTION]) public static function getByURIId(int $uri_id, array $type = [self::HASHTAG, self::MENTION, self::IMPLICIT_MENTION, self::EXCLUSIVE_MENTION])
{ {
$condition = ['uri-id' => $uri_id, 'type' => $type]; $condition = ['uri-id' => $uri_id, 'type' => $type];
$tags = DBA::select('tag-view', ['type', 'name', 'url'], $condition); return DBA::selectToArray('tag-view', ['type', 'name', 'url'], $condition);
if (!DBA::isResult($tags)) {
return [];
}
$tag_list = [];
while ($tag = DBA::fetch($tags)) {
$tag['term'] = $tag['name']; /// @todo Remove this line when all occurrences of "term" had been replaced with "name"
$tag_list[] = $tag;
}
return $tag_list;
} }
/** /**

2
view/templates/admin/item/source.tpl
View file

@ -45,7 +45,7 @@
{{if $term.type == 8}}Implicit Mention{{/if}} {{if $term.type == 8}}Implicit Mention{{/if}}
</td> </td>
<td> <td>
{{$term.term}} {{$term.name}}
</td> </td>
<td> <td>
{{$term.url}} {{$term.url}}