From d6f531adc990930f12454ec139475c7f693a8d25 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 19 Nov 2017 11:07:45 +0200
Subject: [PATCH] Merge gateway limits fix

---
 app/Models/EntityModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index 96ebdd2f527d..79175a43d79e 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -161,7 +161,7 @@ class EntityModel extends Eloquent
 
         $query->where($this->getTable() .'.account_id', '=', $accountId);
 
-        if (func_num_args() > 1 && ! $publicId) {
+        if (func_num_args() > 1 && ! $publicId && ! $accountId) {
             $query->where('id', '=', 0);
             return $query;
         }