From 9109cf62e464b94ad5ce481641b6c16d4da12a92 Mon Sep 17 00:00:00 2001 From: lkassianik Date: Thu, 18 Jun 2015 09:06:12 -0700 Subject: [PATCH] More correct fix - set default value array() for `getParameter` call. Summary: Ref T8577, More correct fix - set default value array() for `getParameter` call. Test Plan: Make sure saved queries like Month View, Day View, and Upcoming Events, still work. Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: epriestley, Korvin Maniphest Tasks: T8577 Differential Revision: https://secure.phabricator.com/D13330 --- .../query/PhabricatorCalendarEventSearchEngine.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php index 0dc4d569f1..d2898177ad 100644 --- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php +++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php @@ -126,15 +126,15 @@ final class PhabricatorCalendarEventSearchEngine $query->withDateRange($min_range, $max_range); } - $invited_phids = $saved->getParameter('invitedPHIDs'); + $invited_phids = $saved->getParameter('invitedPHIDs', array()); + $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 = $saved->getParameter('creatorPHIDs', array()); + $creator_phids = $user_datasource->evaluateTokens($creator_phids); if ($creator_phids) { - $creator_phids = $user_datasource->evaluateTokens($creator_phids); $query->withCreatorPHIDs($creator_phids); }