D7575.diff
All Users
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7575.diff
View Options

	diff --git a/src/applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php
	--- a/src/applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php
	+++ b/src/applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php
	@@ -63,6 +63,9 @@
	$info[] = null;
	$info[] = pht('HEADERS');
	foreach ($message->getHeaders() as $key => $value) {
	+ if (is_array($value)) {
	+ $value = implode("\n", $value);
	+ }
	$info[] = pht('%s: %s', $key, $value);
	}

	diff --git a/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php b/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
	--- a/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
	+++ b/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
	@@ -156,7 +156,7 @@
	'(?P<sender>\w+)'.
	'\\+'.
	'(?P<hash>[a-f0-9]{16})'.
	- '$)U';
	+ '$)Ui';

	return $regexp;
	}
	@@ -166,7 +166,9 @@
	PhabricatorUser $sender) {
	$parts = $this->matchObjectAddressInMail($mail);

	- return $this->loadObject($parts['pattern'], $sender);
	+ return $this->loadObject(
	+ phutil_utf8_strtoupper($parts['pattern']),
	+ $sender);
	}

	public static function computeMailHash($mail_key, $phid) {