D12845.id30899.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D12845.id30899.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
	@@ -123,6 +123,12 @@
	'',
	$body);

	+ // French GMail quoted text. See T8199.
	+ $body = preg_replace(
	+ '/^\s\d{4}-\d{2}-\d{2} \d+:\d+ GMT.:.*?/imsU',
	+ '',
	+ $body);
	+
	return rtrim($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
	@@ -254,6 +254,13 @@
	{$emdash}
	Sent from Mailbox
	EOMAIL
	+,
	+<<<EOMAIL
	+OKAY
	+
	+2015-05-06 11:21 GMT-07:00 Someone <someone@somewhere.com>:
	+> ...
	+EOMAIL
	);
	}