MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.2.1'

pull/219/merge
iglocska 2014-02-19 17:39:13 +01:00
parent 6c54c85686 914687142e
commit 1af6979365
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/TagsController.php
View File

@ -73,7 +73,8 @@ class TagsController extends AppController {
if (!$this->Tag->exists()) {
throw new NotFoundException('Invalid tag');
}
if ($this->Attribute->delete()) {
if ($this->Tag->delete()) {
$this->Tag->EventTag->deleteAll(array('EventTag.tag_id' => $id));
$this->Session->setFlash(__('Attribute deleted'));
} else {
$this->Session->setFlash(__('Attribute was not deleted'));