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

fix: Further merge fixes

pull/1857/head
iglocska 2017-01-16 17:45:24 +01:00
parent 7b665dbb6b
commit 1e2ae2ac90
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/AppModel.php
View File

@ -22,7 +22,6 @@
App::uses('Model', 'Model'); App::uses('Model', 'Model');
App::uses('LogableBehavior', 'Assets.models/behaviors'); App::uses('LogableBehavior', 'Assets.models/behaviors');
class AppModel extends Model { class AppModel extends Model {
public $name; public $name;
@ -558,7 +557,7 @@ class AppModel extends Model {
} }
$this->__dropIndex('attribute_tags', 'attribute_id'); $this->__dropIndex('attribute_tags', 'attribute_id');
$this->__dropIndex('attribute_tags', 'tag_id'); $this->__dropIndex('attribute_tags', 'tag_id');
break; break;
case 'fixNonEmptySharingGroupID': case 'fixNonEmptySharingGroupID':
$sqlArray[] = 'UPDATE `events` SET `sharing_group_id` = 0 WHERE `distribution` != 4;'; $sqlArray[] = 'UPDATE `events` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';
$sqlArray[] = 'UPDATE `attributes` SET `sharing_group_id` = 0 WHERE `distribution` != 4;'; $sqlArray[] = 'UPDATE `attributes` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';

2
app/Model/Event.php
View File

@ -2228,8 +2228,6 @@ class Event extends AppModel {
} else { } else {
$this->Attribute->create(); $this->Attribute->create();
} }
} else {
$this->Attribute->create();
} }
$data['Event']['Attribute'][$k]['event_id'] = $this->id; $data['Event']['Attribute'][$k]['event_id'] = $this->id;
if ($data['Event']['Attribute'][$k]['distribution'] == 4) { if ($data['Event']['Attribute'][$k]['distribution'] == 4) {