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

Merge branch 'hotfix-2.3.114'

pull/542/merge v2.3.115
Iglocska 2015-08-24 13:31:09 +02:00
parent 6ba92be513 8d24f9a7ff
commit b7480586ed
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":113}
{"major":2, "minor":3, "hotfix":114}

5
app/Controller/AttributesController.php
View File

@ -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)) . ')';
}