[Hastymail-cvs] SF.net SVN: hastymail:[1645] trunk/hastymail2/lib/misc_functions.php
Brought to you by:
sailfrog,
slushpupie
From: <sai...@us...> - 2010-08-08 19:38:26
|
Revision: 1645 http://hastymail.svn.sourceforge.net/hastymail/?rev=1645&view=rev Author: sailfrog Date: 2010-08-08 19:38:19 +0000 (Sun, 08 Aug 2010) Log Message: ----------- fix a problem with inline image replacement in HTML message parts Modified Paths: -------------- trunk/hastymail2/lib/misc_functions.php Modified: trunk/hastymail2/lib/misc_functions.php =================================================================== --- trunk/hastymail2/lib/misc_functions.php 2010-08-03 18:18:46 UTC (rev 1644) +++ trunk/hastymail2/lib/misc_functions.php 2010-08-08 19:38:19 UTC (rev 1645) @@ -743,7 +743,7 @@ global $user; global $sticky_url; global $conf; - $regex = "/(background|src)=(\"|'|)(denied:|)cid:([^@]+@[^>'\"]+)(\"|'|)/im"; + $regex = "/(background|src)=(\"|'|)(denied:|)cid:([^'\"@]+@[^>'\"]+)(\"|'|)/im"; $regex2 = "/(background|src)=(\"|'|)(denied:|)cid:([^'\"\s]+)(\"|'|)/im"; $regex3 = "/(background|src)=(\"|'|)()(\d+_multipart\?[^'\"\s]+)(\"|'|)/im"; if (preg_match_all($regex, $string, $matches) || preg_match_all($regex2, $string, $matches) || preg_match_all($regex3, $string, $matches)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |