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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/5668/head
Raphaël Vinot 2020-02-26 16:38:11 +01:00
parent b077b14273 eb6b260c5e
commit d01b1814d3
3 changed files with 3 additions and 3 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":4, "hotfix":121}
{"major":2, "minor":4, "hotfix":122}

2
app/Console/Command/AdminShell.php
View File

@ -353,7 +353,7 @@ class AdminShell extends AppShell
$whoami = exec('whoami');
if ($whoami === 'httpd' || $whoami === 'www-data' || $whoami === 'apache' || $whoami === 'wwwrun' || $whoami === 'travis') {
echo 'Executing all updates to bring the database up to date with the current version.' . PHP_EOL;
$processId = $this->args[0];
$processId = empty($this->args[0]) ? false : $this->args[0];
$this->Server->runUpdates(true, false, $processId);
echo 'All updates completed.' . PHP_EOL;
} else {

2
app/Controller/AppController.php
View File

@ -47,7 +47,7 @@ class AppController extends Controller
public $helpers = array('Utility', 'OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '98';
public $pyMispVersion = '2.4.121';
public $pyMispVersion = '2.4.122';
public $phpmin = '7.2';
public $phprec = '7.4';
public $pythonmin = '3.6';