D12349.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D12349.diff
View Options

	diff --git a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
	--- a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
	+++ b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
	@@ -135,9 +135,11 @@
	$body);

	// Mailbox seems to make an attempt to comply with the "standard" but
	- // omits the leading newline and uses an em dash?
	+ // omits the leading newline and uses an em dash. This may or may not have
	+ // the trailing space, but it's unique enough that there's no real ambiguity
	+ // in detecting it.
	$body = preg_replace(
	- "/\s\xE2\x80\x94 \nSent from Mailbox\s\z/su",
	+ "/\s\xE2\x80\x94\s\nSent from Mailbox\s*\z/su",
	'',
	$body);

	diff --git a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
	--- a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
	+++ b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
	@@ -247,6 +247,13 @@
	OKAY {$emdash}{$trailing_space}
	Sent from Mailbox
	EOMAIL
	+,
	+<<<EOMAIL
	+OKAY
	+
	+{$emdash}
	+Sent from Mailbox
	+EOMAIL
	);
	}