D10242.diff
No OneTemporary
Actions

Size

855 B

Referenced Files

None

Subscribers

None

D10242.diff
View Options

	diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php
	--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php
	+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php
	@@ -31,7 +31,7 @@
	foreach ($macros as $macro_name => $macro) {
	$regexp[] = preg_quote($macro_name, '/');
	}
	- $regexp = '/('.implode('\|', $regexp).')/';
	+ $regexp = '/^('.implode('\|', $regexp).')\z/';

	$this->macros = $macros;
	$this->regexp = $regexp;
	@@ -49,7 +49,7 @@
	$message_body = $message->getBody();

	$matches = null;
	- if (!preg_match($this->regexp, $message_body, $matches)) {
	+ if (!preg_match($this->regexp, trim($message_body), $matches)) {
	return;
	}