[php-blog-cvs] serendipity serendipity_functions.inc.php,1.385,1.386

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2740

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Use mail_trackbacks for something


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -d -r1.385 -r1.386
--- serendipity_functions.inc.php	8 Aug 2004 15:24:49 -0000	1.385
+++ serendipity_functions.inc.php	8 Aug 2004 15:30:33 -0000	1.386
@@ -1753,14 +1753,16 @@
         serendipity_db_query($query);
         $cid = serendipity_db_insert_id();
 
-        $query = "SELECT email, title, mail_comments, e.moderate_comments
+        $query = "SELECT a.email, e.title, a.mail_comments, a.mail_trackbacks, e.moderate_comments
                  FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
                  WHERE e.id  = '$id'
                  AND e.authorid = a.authorid";
         $row = serendipity_db_query($query, true); // Get info on author/entry
 
         // 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'])) {
+        if (serendipity_db_bool($ca['moderate_comments']) 
+            || ($type == 'NORMAL' && serendipity_db_bool($row['mail_comments']))
+            || ($type == 'TRACKBACK' && serendipity_db_bool($row['mail_trackbacks']))) {
             serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($row['moderate_comments']));
         }