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

Merge pull request #11474 from annando/issue-11440 

Issue 11440: Hashtags are now generated again
This commit is contained in:
Tobias Diekershoff 2022-05-07 09:31:13 +02:00 committed by GitHub
parent 4729fca5d9 67c3a20c4f
commit 166f38ef3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Model/Tag.php
View File

@ -224,13 +224,16 @@ class Tag
{ {
$fields = ['name' => substr($name, 0, 96), 'url' => $url]; $fields = ['name' => substr($name, 0, 96), 'url' => $url];
if (!empty($type)) { $tag = DBA::selectFirst('tag', ['id', 'type'], $fields);
$fields['type'] = $type; if (DBA::isResult($tag)) {
if (empty($tag['type']) && !empty($type)) {
DBA::update('tag', ['type' => $type], $fields);
}
return $tag['id'];
} }
$tag = DBA::selectFirst('tag', ['id'], $fields); if (!empty($type)) {
if (DBA::isResult($tag)) { $fields['type'] = $type;
return $tag['id'];
} }
DBA::insert('tag', $fields, Database::INSERT_IGNORE); DBA::insert('tag', $fields, Database::INSERT_IGNORE);