From e668ee9f5f3822a957a2c8609ee790d4a7246435 Mon Sep 17 00:00:00 2001 From: chrisaga Date: Fri, 26 May 2006 15:56:02 +0000 Subject: merge trunk r1320:1321 into branch 1.6 git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1322 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_mail.inc.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include/functions_mail.inc.php') diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php index 06d4d3e2d..86ded9473 100644 --- a/include/functions_mail.inc.php +++ b/include/functions_mail.inc.php @@ -122,10 +122,6 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '') $content = $infos; $content.= $conf_mail['text_footer']; - // Convert Text on HTML format to raw text format - $subject = html_entity_decode($subject); - $content = html_entity_decode($content); - if ($conf_mail['mail_options']) { $options = '-f '.$from; @@ -138,4 +134,4 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '') } } -?> \ No newline at end of file +?> -- cgit v1.2.3