aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-05-26 15:56:02 +0000
committerchrisaga <chrisaga@piwigo.org>2006-05-26 15:56:02 +0000
commite668ee9f5f3822a957a2c8609ee790d4a7246435 (patch)
tree46b305b5b5e1f10c4ac28b8fd989f0b2009cf506
parent91642e86831e090615fa1e25058e692b33a0768d (diff)
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
-rw-r--r--include/functions_mail.inc.php6
1 files changed, 1 insertions, 5 deletions
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
+?>