Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21085
Modified Files:
serendipity_functions.inc.php
Log Message:
Fixed that we are no longer honouring mail_comments
Override mail_comments if the comment is awaiting moderation
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -d -r1.356 -r1.357
--- serendipity_functions.inc.php 20 Jul 2004 17:52:58 -0000 1.356
+++ serendipity_functions.inc.php 20 Jul 2004 17:58:57 -0000 1.357
@@ -1724,10 +1724,12 @@
AND e.authorid = a.authorid";
$row = serendipity_db_query($query, true); // Get info on author/entry
- // Send mail to author
- serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($row['moderate_comments']));
+ // Send mail to the author if he chose to receive these mails, or if the comment is awaiting moderation
+ if (serendipity_db_bool($ca['moderate_comments']) || serendipity_db_bool($row['mail_comments'])) {
+ serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($row['moderate_comments']));
+ }
- // Approve with force if moderation is disabled or it is a trackback
+ // Approve with force, if moderation is disabled or it is a trackback
if (empty($ca['moderate_comments']) || serendipity_db_bool($ca['moderate_comments']) == false || $type == 'TRACKBACK') {
serendipity_approveComment($cid, $id, true);
}
|
