RetailCRM-Mirror/Fetch
1
0
Fork 0
mirror of https://github.com/retailcrm/Fetch.git synced 2025-02-17 23:43:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from ArabCoders/master

Browse Source 
fixed bug in getting reply_to addresses
This commit is contained in:
Robert Hafner 2013-11-30 23:34:53 -08:00
commit 691f8e001c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fetch/Message.php
View File

@ -311,7 +311,8 @@ class Message
} }
} else { } else {
if (!isset($this->plaintextMessage) && isset($this->htmlMessage)) { if (!isset($this->plaintextMessage) && isset($this->htmlMessage)) {
$output = strip_tags($this->htmlMessage); $output = preg_replace('/\<br(\s*)?\/?\>/i', PHP_EOL, trim($this->htmlMessage) );
$output = strip_tags($output);
return $output; return $output;
} elseif (isset($this->plaintextMessage)) { } elseif (isset($this->plaintextMessage)) {
@ -332,7 +333,8 @@ class Message
*/ */
public function getAddresses($type, $asString = false) public function getAddresses($type, $asString = false)
{ {
$addressTypes = array('to', 'cc', 'bcc', 'from', 'reply-to'); $type = ( $type == 'reply-to' ) ? 'replyTo' : $type;
$addressTypes = array('to', 'cc', 'bcc', 'from', 'replyTo');
if (!in_array($type, $addressTypes) || !isset($this->$type) || count($this->$type) < 1) if (!in_array($type, $addressTypes) || !isset($this->$type) || count($this->$type) < 1)
return false; return false;