From 868ee3ef2fd1f4993c1df7e5e6c7002f136ed98e Mon Sep 17 00:00:00 2001
From: lkassianik <lyubakassianik@gmail.com>
Date: Wed, 17 Jun 2015 08:12:01 -0700
Subject: [PATCH] Only evaluate tokens if phids not null

Summary: Fixes T8577, Only evaluate tokens if phids not null

Test Plan: Open Upcoming Events in Calendar.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T8577

Differential Revision: https://secure.phabricator.com/D13326
---
 .../calendar/query/PhabricatorCalendarEventSearchEngine.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
index d67c3b1589..0dc4d569f1 100644
--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
@@ -127,14 +127,14 @@ final class PhabricatorCalendarEventSearchEngine
     }
 
     $invited_phids = $saved->getParameter('invitedPHIDs');
-    $invited_phids = $user_datasource->evaluateTokens($invited_phids);
     if ($invited_phids) {
+      $invited_phids = $user_datasource->evaluateTokens($invited_phids);
       $query->withInvitedPHIDs($invited_phids);
     }
 
     $creator_phids = $saved->getParameter('creatorPHIDs');
-    $creator_phids = $user_datasource->evaluateTokens($creator_phids);
     if ($creator_phids) {
+      $creator_phids = $user_datasource->evaluateTokens($creator_phids);
       $query->withCreatorPHIDs($creator_phids);
     }