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

Merge branch '2.4' into develop

pull/7622/head
iglocska 2021-08-02 13:31:19 +02:00
parent 87c674ab15 269883c4ef
commit 4739e1f234
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Model/AppModel.php
View File

@ -1891,6 +1891,7 @@ class AppModel extends Model
unlink($file);
}
}
return true;
}
public function getPythonVersion()

2
app/Model/Server.php
View File

@ -2090,6 +2090,7 @@ class Server extends AppModel
);
$job->saveField('process_id', $process_id);
}
return true;
}
public function ipLogBeforeHook($setting, $value)
@ -2219,7 +2220,6 @@ class Server extends AppModel
} else {
$oldValue = Configure::read($setting['name']);
$settingSaveResult = $this->serverSettingsSaveValue($setting['name'], $value);
if ($settingSaveResult) {
$this->Log = ClassRegistry::init('Log');
$change = array($setting['name'] => array($oldValue, $value));