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

fix: [appmodel] Fixed merged conflict and typo in sql query

pull/8530/head
Sami Mokaddem 2022-08-01 10:19:38 +02:00
parent 151d23a8c2
commit d83039f520
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Model/AppModel.php
View File

@ -227,7 +227,7 @@ class AppModel extends Model
case 48:
$dbUpdateSuccess = $this->__generateCorrelations();
break;
case 87:
case 89:
$this->Workflow = Classregistry::init('Workflow');
$this->Workflow->enableDefaultModules();
break;
@ -1793,13 +1793,14 @@ class AppModel extends Model
`name` varchar(191) NOT NULL,
`description` varchar(191) NOT NULL,
`timestamp` int(11) NOT NULL DEFAULT 0,
`default` tinyint(1) NOT NULL DEFAULT 0;
`default` tinyint(1) NOT NULL DEFAULT 0,
`data` text,
PRIMARY KEY (`id`),
INDEX `uuid` (`uuid`),
INDEX `name` (`name`),
INDEX `timestamp` (`timestamp`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;";
break;
case 'fixNonEmptySharingGroupID':
$sqlArray[] = 'UPDATE `events` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';
$sqlArray[] = 'UPDATE `attributes` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';