cvs: pear /Mail_Mime mime.php
| From: | Cipriano Groenendal | Date: | Thu, 09 Jun 2005 22:54:02 +0000 |
| Subject: | cvs: pear /Mail_Mime mime.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-32449@lists.php.net to get a copy of this message | ||
cipri Thu Jun 9 18:54:02 2005 EDT
Modified files:
/pear/Mail_Mime mime.php
Log:
Fix for bugs #4297 and #4455;
regexp now maches src and background elements,
and both case insensitively.
http://cvs.php.net/diff.php/pear/Mail_Mime/mime.php?r1=1.35&r2=1.36&ty=u
Index: pear/Mail_Mime/mime.php
diff -u pear/Mail_Mime/mime.php:1.35 pear/Mail_Mime/mime.php:1.36
--- pear/Mail_Mime/mime.php:1.35 Sat Mar 26 17:07:56 2005
+++ pear/Mail_Mime/mime.php Thu Jun 9 18:53:59 2005
@@ -35,7 +35,7 @@
// | Tomas V.V.Cox <cox@idecnet.com> (port to PEAR) |
// +-----------------------------------------------------------------------+
//
-// $Id: mime.php,v 1.35 2005/03/26 22:07:56 cipri Exp $
+// $Id: mime.php,v 1.36 2005/06/09 22:53:59 cipri Exp $
require_once('PEAR.php');
require_once('Mail/mimePart.php');
@@ -460,9 +460,9 @@
if (!empty($this->_html_images) AND isset($this->_htmlbody)) {
foreach ($this->_html_images as $value) {
- $regex = '#src\s*=\s*(["\']?)' .
preg_quote($value['name']) .
+ $regex = '#(\s)((?i)src|background(?-i))\s*=\s*(["\']?)' .
preg_quote($value['name']) .
'(["\'])?#';
- $rep = 'src=\1cid:' . $value['cid'] .'\2';
+ $rep = '\1\2=\3cid:' . $value['cid'] .'\4';
$this->_htmlbody = preg_replace($regex, $rep,
$this->_htmlbody
);