[php-blog-cvs] serendipity comment.php,1.44.2.4,1.44.2.5 serendipity_admin_comments.inc.php,1.17.2.5,1.17.2.6 serendipity_functions.inc.php,1.419.2.39,1.419.2.40

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

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

Modified Files:
      Tag: branch-smarty
	comment.php serendipity_admin_comments.inc.php 
	serendipity_functions.inc.php 
Log Message:
- Remove $allow_comments also, not used for anything


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.39
retrieving revision 1.419.2.40
diff -u -d -r1.419.2.39 -r1.419.2.40
--- serendipity_functions.inc.php	5 Oct 2004 19:40:39 -0000	1.419.2.39
+++ serendipity_functions.inc.php	5 Oct 2004 19:56:30 -0000	1.419.2.40
@@ -1010,7 +1010,7 @@
                 serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id']));
 
                 ob_start(); // TODO: Remove recursion and output buffering
-                serendipity_printComments(serendipity_fetchComments($entry['id']),(isset($entry['allow_comments']) ? $entry['allow_comments'] : true), $viewmode);
+                serendipity_printComments(serendipity_fetchComments($entry['id']), $viewmode);
 
                 if (!empty($serendipity['POST']['preview'])) {
                     serendipity_printComments(
@@ -1024,7 +1024,6 @@
                                 'timestamp' => time()
                             )
                         ),
-                        false,
                         $serendipity['POST']['replyTo']
                     );
                 }
@@ -1228,8 +1227,7 @@
 }
 
 /*TODO: Don't know how to get recursion done with Smarty in a smarty way.*/
-function serendipity_printComments($comments, $allow_comments = true, $parentid = 0, $indent = '')
-{
+function serendipity_printComments($comments, $parentid = 0, $indent = '') {
     global $serendipity;
 
     if ($parentid === VIEWMODE_THREADED) {
@@ -1304,7 +1302,7 @@
             </div>
 <?php
                 if ($comment['id'] && $parentid !== VIEWMODE_LINEAR ) {
-                    serendipity_printComments($comments, $allow_comments, $comment['id'], $indent . $i . '.');
+                    serendipity_printComments($comments, $comment['id'], $indent . $i . '.');
                 }
 ?>
         </div>

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.44.2.4
retrieving revision 1.44.2.5
diff -u -d -r1.44.2.4 -r1.44.2.5
--- comment.php	5 Oct 2004 19:40:39 -0000	1.44.2.4
+++ comment.php	5 Oct 2004 19:56:30 -0000	1.44.2.5
@@ -128,7 +128,7 @@
             $query = "SELECT id, last_modified, timestamp, allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '" . $id . "'";
             $ca    = serendipity_db_query($query, true);
 
-            serendipity_printComments(serendipity_fetchComments($id), (isset($ca['allow_comments']) ? $ca['allow_comments'] : true));
+            serendipity_printComments(serendipity_fetchComments($id));
 
             if ($serendipity['POST']['preview']) {
                 serendipity_printComments(
@@ -140,8 +140,7 @@
                       'url'       => $serendipity['POST']['url'],
                       'timestamp' => time()
                     )
-                  ),
-                  false
+                  )
                 );
             }
 

Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -u -d -r1.17.2.5 -r1.17.2.6
--- serendipity_admin_comments.inc.php	5 Oct 2004 19:40:39 -0000	1.17.2.5
+++ serendipity_admin_comments.inc.php	5 Oct 2004 19:56:30 -0000	1.17.2.6
@@ -86,8 +86,7 @@
                   'url'       => $serendipity['POST']['url'],
                   'timestamp' => time()
                 )
-              ),
-              false
+              )
             );
 
     }