From e8bcab19db0d899becc76cd2a9e7422a821efb30 Mon Sep 17 00:00:00 2001 From: Iglocska Date: Mon, 13 Apr 2015 14:40:42 +0200 Subject: [PATCH] Background job for pull incorrectly checks the push flag on the server, fixes #457 - Issue fixed: When background jobs are enabled the wrong flag is checked when attemptying to enqueue a pull --- VERSION.json | 2 +- app/Console/Command/ServerShell.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.json b/VERSION.json index 517fb9647..80344d9aa 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1 +1 @@ -{"major":2, "minor":3, "hotfix":58} +{"major":2, "minor":3, "hotfix":60} diff --git a/app/Console/Command/ServerShell.php b/app/Console/Command/ServerShell.php index c1b0782f2..e72c1816f 100644 --- a/app/Console/Command/ServerShell.php +++ b/app/Console/Command/ServerShell.php @@ -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();