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

Merge branch 'hotfix-2.3.60'

pull/468/head v2.3.61
Iglocska 2015-04-13 14:42:37 +02:00
parent 356e9ec383 e8bcab19db
commit 72f8dc0d3d
2 changed files with 2 additions and 2 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":58}
{"major":2, "minor":3, "hotfix":60}

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

@ -84,7 +84,7 @@ class ServerShell extends AppShell
}
$this->User->recursive = -1;
$user = $this->User->read(array('id', 'org', 'email'), $userId);
$servers = $this->Server->find('all', array('recursive' => -1, 'conditions' => array('push' => 1)));
$servers = $this->Server->find('all', array('recursive' => -1, 'conditions' => array('pull' => 1)));
$count = count($servers);
foreach ($servers as $k => $server) {
$this->Job->create();