Skip to content

Commit

Permalink
This is no longer necessary.
Browse files Browse the repository at this point in the history
We have this implemented in Horde_Prefs, and it's incompatible anyway.
  • Loading branch information
yunosh committed Mar 4, 2016
1 parent 572b788 commit a4ec1ba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
18 changes: 0 additions & 18 deletions framework/Core/lib/Horde/Core/Prefs/Identity.php
Original file line number Diff line number Diff line change
Expand Up @@ -190,24 +190,6 @@ public function getName($ident = null)
return parent::getName($ident);
}

/**
* Returns the from address based on the chosen identity. If no
* address can be found it is built from the current user name and
* the specified maildomain.
*
* @param integer $ident The identity to retrieve the address from.
*
* @return string A valid from address.
*/
public function getFromAddress($ident = null)
{
$from = $this->getValue('from_addr', $ident);
if (strlen($from)) {
return $from;
}
return $this->_user;
}

/**
* Returns the identity's id that matches the passed addresses.
*
Expand Down
2 changes: 1 addition & 1 deletion kronolith/lib/Kronolith.php
Original file line number Diff line number Diff line change
Expand Up @@ -1974,7 +1974,7 @@ public static function sendITipNotifications(
$attendee = new Horde_Itip_Resource_Identity(
$ident,
$vEvent->getAttribute('ATTENDEE'),
$ident->getFromAddress()
(string)$ident->getFromAddress()
);
/* Find which of the creator's mail addresses is used here */
foreach ($event->attendees as $attendeeEmail => $status) {
Expand Down

0 comments on commit a4ec1ba

Please sign in to comment.