Page MenuHomePhabricator
Files F14395158

D12556.diff
No OneTemporary
Actions

D12556.diff
View Options

diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -71,11 +71,11 @@
->needDrafts(true)
->needRelationships(true);
- $datasource = id(new PhabricatorPeopleUserFunctionDatasource())
+ $user_datasource = id(new PhabricatorPeopleUserFunctionDatasource())
->setViewer($this->requireViewer());
$responsible_phids = $saved->getParameter('responsiblePHIDs', array());
- $responsible_phids = $datasource->evaluateTokens($responsible_phids);
+ $responsible_phids = $user_datasource->evaluateTokens($responsible_phids);
if ($responsible_phids) {
$query->withResponsibleUsers($responsible_phids);
}
@@ -83,6 +83,7 @@
$this->setQueryProjects($query, $saved);
$author_phids = $saved->getParameter('authorPHIDs', array());
+ $author_phids = $user_datasource->evaluateTokens($author_phids);
if ($author_phids) {
$query->withAuthors($author_phids);
}
@@ -92,7 +93,10 @@
$query->withReviewers($reviewer_phids);
}
+ $sub_datasource = id(new PhabricatorMetaMTAMailableFunctionDatasource())
+ ->setViewer($this->requireViewer());
$subscriber_phids = $saved->getParameter('subscriberPHIDs', array());
+ $subscriber_phids = $sub_datasource->evaluateTokens($subscriber_phids);
if ($subscriber_phids) {
$query->withCCs($subscriber_phids);
}
@@ -146,7 +150,7 @@
id(new AphrontFormTokenizerControl())
->setLabel(pht('Authors'))
->setName('authors')
- ->setDatasource(new PhabricatorPeopleDatasource())
+ ->setDatasource(new PhabricatorPeopleUserFunctionDatasource())
->setValue($author_phids))
->appendControl(
id(new AphrontFormTokenizerControl())
@@ -158,7 +162,7 @@
id(new AphrontFormTokenizerControl())
->setLabel(pht('Subscribers'))
->setName('subscribers')
- ->setDatasource(new PhabricatorMetaMTAMailableDatasource())
+ ->setDatasource(new PhabricatorMetaMTAMailableFunctionDatasource())
->setValue($subscriber_phids))
->appendControl(
id(new AphrontFormTokenizerControl())

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 3:14 AM (18 h, 13 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6920423
Default Alt Text
D12556.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility