mirror of https://github.com/MISP/MISP
Merge branch 'hotfix-2.3.114' into develop
commit
3b33e1ab10
|
@ -1 +1 @@
|
|||
{"major":2, "minor":3, "hotfix":113}
|
||||
{"major":2, "minor":3, "hotfix":114}
|
|
@ -2113,9 +2113,8 @@ class AttributesController extends AppController {
|
|||
|
||||
if ($hash) $validTypes = $this->Attribute->resolveHashType($hash);
|
||||
$types = array();
|
||||
if ($hash && $allSamples) {
|
||||
if ($hash) {
|
||||
debug($hash);
|
||||
if ($hash) {
|
||||
if ($allSamples) {
|
||||
if (empty($validTypes)) {
|
||||
$error = 'Invalid hash format (valid options are ' . implode(', ', array_keys($this->Attribute->hashTypes)) . ')';
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue