Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1299
Modified Files:
serendipity_admin_entries.inc.php
serendipity_functions.inc.php
Log Message:
make sure that comment_moderation 'false' is inserted in database if not
checked
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -r1.349 -r1.350
--- serendipity_functions.inc.php 19 Jul 2004 23:39:41 -0000 1.349
+++ serendipity_functions.inc.php 20 Jul 2004 09:54:45 -0000 1.350
@@ -1720,7 +1720,7 @@
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
- if (serendipity_db_bool($ca['moderate_comments']) == false || $type == 'TRACKBACK') {
+ if (empty($ca['moderate_comments']) || serendipity_db_bool($ca['moderate_comments']) == false || $type == 'TRACKBACK') {
serendipity_approveComment($cid, $id, true);
}
serendipity_purgeEntry($id, $t);
Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_admin_entries.inc.php 16 Jul 2004 22:17:23 -0000 1.29
+++ serendipity_admin_entries.inc.php 20 Jul 2004 09:54:45 -0000 1.30
@@ -268,6 +268,10 @@
$entry['allow_comments'] = 'false';
}
+ if ($entry['moderate_comments'] != 'true' && $entry['moderate_comments'] !== true) {
+ $entry['moderate_comments'] = 'false';
+ }
+
// Check if the user changed the timestamp.
if (isset($serendipity['allowDateManipulation']) && $serendipity['allowDateManipulation'] && isset($serendipity['POST']['new_timestamp']) && $serendipity['POST']['new_timestamp'] != date(DATE_FORMAT_2, $serendipity['POST']['chk_timestamp'])) {
// The user changed the timestamp, now set the DB-timestamp to the user's date
|
