D8976.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8976.diff
View Options

	diff --git a/src/applications/macro/query/PhabricatorMacroQuery.php b/src/applications/macro/query/PhabricatorMacroQuery.php
	--- a/src/applications/macro/query/PhabricatorMacroQuery.php
	+++ b/src/applications/macro/query/PhabricatorMacroQuery.php
	@@ -30,7 +30,10 @@

	public static function getFlagColorsOptions() {

	- $options = array('-1' => pht('(No Filtering)'));
	+ $options = array(
	+ '-1' => pht('(No Filtering)'),
	+ '-2' => pht('(Marked With Any Flag)'),
	+ );

	foreach (PhabricatorFlagColor::getColorNameMap() as $color => $name) {
	$options[$color] = $name;
	@@ -169,10 +172,15 @@
	}

	if ($this->flagColor != '-1' && $this->flagColor !== null) {
	+ if ($this->flagColor == '-2') {
	+ $flag_colors = array_keys(PhabricatorFlagColor::getColorNameMap());
	+ } else {
	+ $flag_colors = array($this->flagColor);
	+ }
	$flags = id(new PhabricatorFlagQuery())
	->withOwnerPHIDs(array($this->getViewer()->getPHID()))
	->withTypes(array(PhabricatorMacroPHIDTypeMacro::TYPECONST))
	- ->withColors(array($this->flagColor))
	+ ->withColors($flag_colors)
	->setViewer($this->getViewer())
	->execute();