mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 18:03:04 +02:00
Code

Merge branch 'master' of https://github.com/PHPMailer/PHPMailer

Browse Source
This commit is contained in:
Synchro 2014-12-06 14:52:39 +01:00
commit 4a46a8222b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
class.phpmailer.php
View File

@ -2911,11 +2911,7 @@ class PHPMailer
}
$cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
$message = preg_replace(
'/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
$images[1][$imgindex] . '="cid:' . $cid . '"',
$message
);
$message = str_replace($images[0][$imgindex], $images[1][$imgindex] . '="cid:' . $cid . '"', $message);
}
} elseif (!preg_match('#^[A-z]+://#', $url)) {
// Do not change urls for absolute images (thanks to corvuscorax)

2
class.smtp.php
View File

@ -730,7 +730,7 @@ class SMTP
} else {
$name = array_shift($fields);
if ($name == 'SIZE') {
$fields = $fields[0];
$fields = ($fields) ? $fields[0] : 0;
}
}
$this->server_caps[$name] = ($fields ? $fields : true);