D8998.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8998.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
	@@ -76,13 +76,13 @@

	// Outlook english
	$body = preg_replace(
	- '/^\s-----Original Message-----.?/imsU',
	+ '/^\s(> )?-----Original Message-----.?/imsU',
	'',
	$body);

	// Outlook danish
	$body = preg_replace(
	- '/^\s-----Oprindelig Meddelelse-----.?/imsU',
	+ '/^\s(> )?-----Oprindelig Meddelelse-----.?/imsU',
	'',
	$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
	@@ -169,6 +169,14 @@
	> On 17 Oct 2013, at 17:47, "Someone" <somebody@somewhere> wrote:
	> ...
	EOMAIL
	+,
	+<<<EOMAIL
	+OKAY
	+
	+> -----Original Message-----
	+>
	+> ...
	+EOMAIL
	);
	}