Skip to content
Snippets Groups Projects
Commit 1c866641 authored by Jared Hancock's avatar Jared Hancock
Browse files

Merge remote branch 'upstream/develop' into develop-next

parents f662b684 01308099
No related branches found
Tags v1.9.4-rc4
No related merge requests found
......@@ -73,9 +73,10 @@ class Format {
$str.= Format::encode($part->text, $part->charset, $encoding);
$text = $str;
} elseif(function_exists('iconv_mime_decode')) {
} elseif($text[0] == '=' && function_exists('iconv_mime_decode')) {
$text = iconv_mime_decode($text, 0, $encoding);
} elseif(!strcasecmp($encoding, 'utf-8') && function_exists('imap_utf8')) {
} elseif(!strcasecmp($encoding, 'utf-8')
&& function_exists('imap_utf8')) {
$text = imap_utf8($text);
}
......
......@@ -513,12 +513,18 @@ class Mail_Parse {
$parsed = Mail_RFC822::parseAddressList($address, null, null,false);
if(PEAR::isError($parsed))
if (PEAR::isError($parsed))
return array();
// Decode name and mailbox
foreach ($parsed as $p) {
$p->personal = Format::mimedecode($p->personal, $this->charset);
// Some mail clients may send ISO-8859-1 strings without proper encoding.
// Also, handle the more sane case where the mailbox is properly encoded
// against RFC2047
$p->mailbox = Format::mimedecode($p->mailbox, $this->charset);
}
return $parsed;
}
......
......@@ -1021,8 +1021,6 @@ class MysqlExecutor {
function _prepare() {
$this->execute();
$this->_setup_output();
if (!$this->stmt->store_result())
throw new OrmException('Unable to process query: '.$this->stmt->error);
}
function execute() {
......@@ -1031,7 +1029,7 @@ class MysqlExecutor {
.' '.$this->sql);
if (count($this->params))
$this->_bind($this->params);
if (!$this->stmt->execute()) {
if (!$this->stmt->execute() || ! $this->stmt->store_result()) {
throw new OrmException('Unable to execute query: ' . $this->stmt->error);
}
return true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment