On Mon, May 11, 2009 at 11:00:27AM +0200, Olivier Berger wrote: > On Mon, May 11, 2009 at 10:52:36AM +0200, Olivier Berger wrote: > > Btw, the fix has already been integrated by Ubuntu : > https://bugs.launchpad.net/debian/+source/mantis/+bug/360809/comments/8 > > Can an updated package be prepared ? >
Here's a proposed interdiff (attached). Not tested if it works actually, but at least build OK. Hope this helps, Best regards,
diff -u mantis-1.1.6+dfsg/debian/changelog mantis-1.1.6+dfsg/debian/changelog --- mantis-1.1.6+dfsg/debian/changelog +++ mantis-1.1.6+dfsg/debian/changelog @@ -1,3 +1,10 @@ +mantis (1.1.6+dfsg-2.1) unstable; urgency=low + + * NMU + * add 05-fix-phpmailer.patch to fix use with phpmailer 2.1 (Closes: #501434) + + -- Olivier Berger <[email protected]> Mon, 11 May 2009 11:11:20 +0200 + mantis (1.1.6+dfsg-2) unstable; urgency=low * Upload to unstable diff -u mantis-1.1.6+dfsg/debian/patches/series mantis-1.1.6+dfsg/debian/patches/series --- mantis-1.1.6+dfsg/debian/patches/series +++ mantis-1.1.6+dfsg/debian/patches/series @@ -4,0 +5,2 @@ +05-fix-phpmailer.patch + only in patch2: unchanged: --- mantis-1.1.6+dfsg.orig/debian/patches/05-fix-phpmailer.patch +++ mantis-1.1.6+dfsg/debian/patches/05-fix-phpmailer.patch @@ -0,0 +1,25 @@ +Index: mantis-1.1.6+dfsg/core/email_api.php +=================================================================== +--- mantis-1.1.6+dfsg.orig/core/email_api.php 2009-04-20 01:48:08.000000000 +0200 ++++ mantis-1.1.6+dfsg/core/email_api.php 2009-04-20 01:51:08.000000000 +0200 +@@ -802,13 +802,17 @@ + } + } + +- if ( !is_null( $mail->smtp ) ) { ++# if ( !is_null( $mail->smtp ) ) { + # @@@ yarick123: It is said in phpMailer comments, that phpMailer::smtp has private access. + # but there is no common method to reset PHPMailer object, so + # I see the smallest evel - to initialize only one 'private' + # field phpMailer::smtp in order to reuse smtp connection. +- $g_phpMailer_smtp = $mail->smtp; +- } ++# $g_phpMailer_smtp = $mail->smtp; ++ $mail->ClearAllRecipients(); ++ $mail->ClearAttachments(); ++ $mail->ClearReplyTos(); ++ $mail->ClearCustomHeaders(); ++# } + + return $t_success; + }
