Skip to content

Commit

Permalink
Revert "Expose this publicly."
Browse files Browse the repository at this point in the history
This reverts commit efceffb.
  • Loading branch information
mrubinsk committed Sep 11, 2016
1 parent c7a8eb3 commit c68b27f
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions framework/Core/lib/Horde/Core/ActiveSync/Mail.php
Expand Up @@ -510,18 +510,17 @@ protected function _getImapMessage()
}

/**
* Return the user's configured From address.
* Return the current user's From address.
*
* @return RFC822 valid email string.
* @since 2.27.0
* @return string A RFC822 valid email string.
*/
public static function getFromAddress($user)
protected function _getIdentityFromAddress()
{
global $prefs;

$ident = $GLOBALS['injector']
->getInstance('Horde_Core_Factory_Identity')
->create($user);
->create($this->_user);

$as_ident = $prefs->getValue('activesync_identity');
$name = $ident->getValue('fullname', $as_ident == 'horde' ? $prefs->getValue('default_identity') : $prefs->getValue('activesync_identity'));
Expand All @@ -535,16 +534,6 @@ public static function getFromAddress($user)
return $rfc822->encoded;
}

/**
* Return the current user's From address.
*
* @return string A RFC822 valid email string.
*/
protected function _getIdentityFromAddress()
{
return self::getFromAddress($this->_user);
}

/**
* Return the current user's ReplyTo address, if available.
*
Expand Down

0 comments on commit c68b27f

Please sign in to comment.