diff --git a/src/applications/phortune/query/PhortuneSubscriptionQuery.php b/src/applications/phortune/query/PhortuneSubscriptionQuery.php --- a/src/applications/phortune/query/PhortuneSubscriptionQuery.php +++ b/src/applications/phortune/query/PhortuneSubscriptionQuery.php @@ -72,6 +72,10 @@ $subscription->attachAccount($account); } + if (!$subscriptions) { + return $subscriptions; + } + $merchants = id(new PhortuneMerchantQuery()) ->setViewer($this->getViewer()) ->withPHIDs(mpull($subscriptions, 'getMerchantPHID')) @@ -87,6 +91,10 @@ $subscription->attachMerchant($merchant); } + if (!$subscriptions) { + return $subscriptions; + } + $implementations = array(); $subscription_map = mgroup($subscriptions, 'getSubscriptionClass'); @@ -109,6 +117,10 @@ $subscription->attachImplementation($implementation); } + if (!$subscriptions) { + return $subscriptions; + } + if ($this->needTriggers) { $trigger_phids = mpull($subscriptions, 'getTriggerPHID'); $triggers = id(new PhabricatorWorkerTriggerQuery())