Merge remote-tracking branch 'origin/develop' into notes

.gitignore

@@ -84,6 +84,7 @@ app/Lib/EventWarning/Custom/*
 !/app/webroot/img/orgs/NCIRC.png
 /app/files/img/custom/*
 !/app/files/img/custom/empty
+!/app/files/img/orgs
 /app/files/img/orgs/*
 !/app/files/img/orgs/ADMIN.png
 !/app/files/img/orgs/MIL.be.png

VERSION.json

@@ -1 +1 @@
-{"major":2, "minor":4, "hotfix":184}
+{"major":2, "minor":4, "hotfix":185}

app/Model/WorkflowModules/action/Module_attribute_edition_operation.php

@@ -39,22 +39,21 @@ class Module_attribute_edition_operation extends WorkflowBaseActionModule
     protected function __saveAttributes(array $attributes, array $rData, array $params, array $user): array
     {
         $success = false;
-        $attributes = [];
         $newAttributes = [];
         foreach ($attributes as $k => $attribute) {
             $newAttribute = $this->_editAttribute($attribute, $rData, $params);
-            $newAttributes[] = $newAttribute;
             unset($newAttribute['timestamp']);
+            $newAttributes[] = $newAttribute;
             $result = $this->Attribute->editAttribute($newAttribute, $rData, $user, $newAttribute['object_id']);
             if (is_array($result)) {
                 $attributes[] = $result;
             }
         }
-        $this->Attribute->editAttributeBulk($attributes, $rData, $user);
-        foreach ($attributes as $k => $attribute) {
+        $this->Attribute->editAttributeBulk($newAttributes, $rData, $user);
+        foreach ($newAttributes as $k => $attribute) {
             $saveSuccess = empty($this->Attribute->validationErrors[$k]);
             if ($saveSuccess) {
-                $rData = $this->_overrideAttribute($attribute, $newAttribute, $rData);
+                $rData = $this->_overrideAttribute($attribute, $attribute, $rData);
             }
             $success = $success || !empty($saveSuccess);
         }

app/files/misp-galaxy

@@ -1 +1 @@
-Subproject commit effee963cc216bf469f76d5c07fcc43299199cdf
+Subproject commit 7e8d57e741ee1ba6e764c1a5e0ba236fc2f64126

app/files/misp-objects

@@ -1 +1 @@
-Subproject commit 3ac509965fdbca06d8a027db22c0064588babd3c
+Subproject commit 3d12addd56d6e5d00cddcc19cb8a788e7f90c46c

app/files/scripts/misp-stix

@@ -1 +1 @@
-Subproject commit 260920bf7c9d8f678b0d69730acb17e9a34811f2
+Subproject commit b8b8b7445754ea3cbc84e2d0b434ecd08740ef95

app/files/taxonomies

@@ -1 +1 @@
-Subproject commit 3d61b20e7ee8bca21f9bffe53c0952c54a6b72b0
+Subproject commit 8cd705ba6200bdd42c0b9565e108b7aaf88db6ac

app/files/warninglists

@@ -1 +1 @@
-Subproject commit f718ecd826e0cc7f956b4939fc7914d9d23d4388
+Subproject commit 80eb7028f9de974d7f163a7563e66b582f61cec0