Backport reply-to fix to 0.9 branch

diff --git a/docs/NEWS b/docs/NEWS
index caf5534fca6764c00141ba1449481f98087632a2..244e96b8a2fb4f017c27911f4b566cb99835c52b 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,5 +1,11 @@
 # $Id$
 
+Version 0.9.1 ()
+------------------------------------------------------------------------
+
+    * Set the correct reply-to name when sending comment mails, thanks
+      to RobA from the forums (garvinhicking)
+
 Version 0.9 (October 28th, 2005)
 ------------------------------------------------------------------------
 

diff --git a/include/functions_comments.inc.php b/include/functions_comments.inc.php
index 98d82a832ba423a3b6a6e0793fbe926885f1a183..f7c35eac8704368e9deadebbb73f93b2c324b8ff 100644 (file)
--- a/include/functions_comments.inc.php
+++ b/include/functions_comments.inc.php
@@ -493,5 +493,5 @@ function serendipity_sendComment($comment_id, $to, $fromName, $fromEmail, $fromU
               . (($moderate_comment) ? "\n" . str_repeat(' ', 3) . str_pad(APPROVE_COMMENT, 15) . ' -- '. $approveURI : '');
     }
 
-    return serendipity_sendMail($to, $subject, $text, $fromEmail);
+    return serendipity_sendMail($to, $subject, $text, $fromEmail, null, $fromName);
 }

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 0c3357ae59f02b671d1415655898efabf76c010b..e912455efc6dc6681b77f2cb2f696756aeca066e 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -21,7 +21,7 @@ if (IS_installed === true && !defined('IN_serendipity')) {
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
 // The version string
-$serendipity['version']         = '0.9';
+$serendipity['version']         = '0.9.1';
 
 // Name of folder for the default theme
 $serendipity['defaultTemplate'] = 'default';