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

serovvitaly · Dec 6, 2014 · 4a46a82 · 4a46a82
2 parents ba4ece8 + 58c862c
commit 4a46a82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -2911,11 +2911,7 @@ public function msgHTML($message, $basedir = '', $advanced = false)
                     }
                     $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)

diff --git a/class.smtp.php b/class.smtp.php
@@ -730,7 +730,7 @@ protected function parseHelloFields($type)
                 } else {
                     $name = array_shift($fields);
                     if ($name == 'SIZE') {
-                        $fields = $fields[0];
+                        $fields = ($fields) ? $fields[0] : 0;
                     }
                 }
                 $this->server_caps[$name] = ($fields ? $fields : true);