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

Only perform Term::deleteAllTags when needed + not needed redirect

This commit is contained in:
Jonny Tischbein 2018-10-23 13:38:31 +02:00
parent 272eb5eb82
commit 26ed71cc14
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/tagrm.php
View File

@ -71,9 +71,6 @@ function update_tags($item_id, $tags){
Item::update(['tag' => $tag_str], ['id' => $item_id]); Item::update(['tag' => $tag_str], ['id' => $item_id]);
info(L10n::t('Tag(s) removed') . EOL ); info(L10n::t('Tag(s) removed') . EOL );
$a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
} }
function tagrm_content(App $a) function tagrm_content(App $a)

5
src/Model/Item.php
View File

@ -896,14 +896,15 @@ class Item extends BaseObject
} }
if (!is_null($tags)) { if (!is_null($tags)) {
Term::deleteAllTags($item['id']);
if ($tags) { if ($tags) {
Term::insertFromTagFieldByItemId($item['id'], $tags); Term::insertFromTagFieldByItemId($item['id'], $tags);
if (!empty($item['tag'])) { if (!empty($item['tag'])) {
DBA::update('item', ['tag' => ''], ['id' => $item['id']]); DBA::update('item', ['tag' => ''], ['id' => $item['id']]);
} }
} }
else {
Term::deleteAllTags($item['id']);
}
} }
if (!empty($files)) { if (!empty($files)) {