D244.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/kernel/utility/email.php
	===================================================================
	--- branches/5.2.x/core/kernel/utility/email.php
	+++ branches/5.2.x/core/kernel/utility/email.php
	@@ -369,7 +369,11 @@
	$this->fromEmail = $user_info['Email'];
	$this->fromName = trim($user_info['FirstName'] . ' ' . $user_info['LastName']);

	- $user = $this->Application->recallObject('u.email-from', null, Array ('skip_autoload' => true));
	+ $user = $this->Application->recallObject(
	+ 'u.email-from',
	+ null,
	+ array('live_table' => true, 'skip_autoload' => true)
	+ );
	/* @var $user UsersItem */

	$user->Load($user_info['PortalUserId']);
	@@ -539,7 +543,11 @@

	array_unshift($this->recipients[EmailTemplate::RECIPIENT_TYPE_TO], $add_recipient);

	- $user = $this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true));
	+ $user = $this->Application->recallObject(
	+ 'u.email-to',
	+ null,
	+ array('live_table' => true, 'skip_autoload' => true)
	+ );
	/* @var $user UsersItem */

	$user->Load($this->recipientUserId);