diff --git a/src/applications/feed/worker/FeedPushWorker.php b/src/applications/feed/worker/FeedPushWorker.php --- a/src/applications/feed/worker/FeedPushWorker.php +++ b/src/applications/feed/worker/FeedPushWorker.php @@ -13,7 +13,9 @@ if (!$story) { throw new PhabricatorWorkerPermanentFailureException( - pht('Feed story does not exist.')); + pht( + 'Feed story (with key "%s") does not exist or could not be loaded.', + $key)); } return $story; diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php --- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php +++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php @@ -68,6 +68,7 @@ private $mailCCPHIDs = array(); private $feedNotifyPHIDs = array(); private $feedRelatedPHIDs = array(); + private $feedShouldPublish = false; private $modularTypes; private $transactionQueue = array(); @@ -1159,6 +1160,7 @@ } if ($this->shouldPublishFeedStory($object, $xactions)) { + $this->feedShouldPublish = true; $this->feedRelatedPHIDs = $this->getFeedRelatedPHIDs($object, $xactions); $this->feedNotifyPHIDs = $this->getFeedNotifyPHIDs($object, $xactions); } @@ -1216,8 +1218,7 @@ )); } - if ($this->shouldPublishFeedStory($object, $xactions)) { - + if ($this->feedShouldPublish) { $mailed = array(); foreach ($messages as $mail) { foreach ($mail->buildRecipientList() as $phid) { @@ -3512,6 +3513,7 @@ 'mailCCPHIDs', 'feedNotifyPHIDs', 'feedRelatedPHIDs', + 'feedShouldPublish', ); }