D10316.id24835.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10316.id24835.diff
View Options

	diff --git a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
	--- a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
	+++ b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
	@@ -72,16 +72,20 @@
	switch ($rule_type) {
	case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
	case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
	- return array(
	- self::ACTION_BLOCK,
	- self::ACTION_EMAIL,
	- self::ACTION_NOTHING
	- );
	+ return array_merge(
	+ array(
	+ self::ACTION_BLOCK,
	+ self::ACTION_EMAIL,
	+ self::ACTION_NOTHING,
	+ ),
	+ parent::getActions($rule_type));
	case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
	- return array(
	- self::ACTION_EMAIL,
	- self::ACTION_NOTHING,
	- );
	+ return array_merge(
	+ array(
	+ self::ACTION_EMAIL,
	+ self::ACTION_NOTHING,
	+ ),
	+ parent::getActions($rule_type));
	}
	}

	@@ -118,7 +122,13 @@
	pht('Blocked push.'));
	break;
	default:
	- throw new Exception(pht('No rules to handle action "%s"!', $action));
	+ $custom_result = parent::handleCustomHeraldEffect($effect);
	+ if ($custom_result === null) {
	+ throw new Exception("No rules to handle action '{$action}'.");
	+ }
	+
	+ $result[] = $custom_result;
	+ break;
	}
	}