D10629.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10629.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
	@@ -103,6 +103,13 @@
	'',
	$body);

	+ // Mailbox seems to make an attempt to comply with the "standard" but
	+ // omits the leading newline and uses an em dash?
	+ $body = preg_replace(
	+ "/\s\xE2\x80\x94 \nSent from Mailbox\s\z/su",
	+ '',
	+ $body);
	+
	// HTC Mail application (mobile)
	$body = preg_replace(
	'/^\s^Sent from my HTC smartphone./sm',
	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
	@@ -66,6 +66,7 @@

	private function getEmailBodies() {
	$trailing_space = ' ';
	+ $emdash = "\xE2\x80\x94";

	return array(
	<<<EOEMAIL
	@@ -177,6 +178,11 @@
	>
	> ...
	EOMAIL
	+,
	+<<<EOMAIL
	+OKAY {$emdash}{$trailing_space}
	+Sent from Mailbox
	+EOMAIL
	);
	}