diff --git a/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php b/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php --- a/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php +++ b/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php @@ -85,22 +85,23 @@ $xactions = $xaction_query->executeWithCursorPager($pager); + $comment_map = array(); if ($xactions) { $template = head($xactions)->getApplicationTransactionCommentObject(); + if ($template) { - $query = new PhabricatorApplicationTransactionTemplatedCommentQuery(); + $query = new PhabricatorApplicationTransactionTemplatedCommentQuery(); - $comment_map = $query - ->setViewer($viewer) - ->setTemplate($template) - ->withTransactionPHIDs(mpull($xactions, 'getPHID')) - ->execute(); - - $comment_map = msort($comment_map, 'getCommentVersion'); - $comment_map = array_reverse($comment_map); - $comment_map = mgroup($comment_map, 'getTransactionPHID'); - } else { - $comment_map = array(); + $comment_map = $query + ->setViewer($viewer) + ->setTemplate($template) + ->withTransactionPHIDs(mpull($xactions, 'getPHID')) + ->execute(); + + $comment_map = msort($comment_map, 'getCommentVersion'); + $comment_map = array_reverse($comment_map); + $comment_map = mgroup($comment_map, 'getTransactionPHID'); + } } $modular_classes = array();