[Tikiwiki-cvs] tiki/lib commentslib.php,1.167.2.5,1.167.2.6

[<ny...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16567

Modified Files:
      Tag: BRANCH-1-10
	commentslib.php 
Log Message:
[FIX] forums: do not use the 'threads' counter anymore

Index: commentslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/commentslib.php,v
retrieving revision 1.167.2.5
retrieving revision 1.167.2.6
diff -u -d -r1.167.2.5 -r1.167.2.6
--- commentslib.php	26 Nov 2007 18:56:13 -0000	1.167.2.5
+++ commentslib.php	26 Nov 2007 20:27:40 -0000	1.167.2.6
@@ -829,7 +829,7 @@
 			    );
 	} else {
 	    $query = "insert into `tiki_forums`(`name`, `description`,
-	    `created`, `lastPost`, `threads`, `comments`,
+	    `created`, `lastPost`, `comments`,
 	    `controlFlood`,`floodInterval`, `moderator`, `hits`, `mail`,
 	    `useMail`, `usePruneUnreplied`, `pruneUnrepliedAge`,
 	    `usePruneOld`,`pruneMaxAge`, `topicsPerPage`,
@@ -850,8 +850,8 @@
 			?,?,?,?,?,?,?,?,?,?,
 			?,?,?,?,?,?,?,?,?,?,
 			?,?,?,?,?,?,?,?,?,?,
-			?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-	    $bindvars=array($name, $description, (int) $this->now, (int) $this->now, 0, 0,
+			?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+	    $bindvars=array($name, $description, (int) $this->now, (int) $this->now, 0,
 		    $controlFlood, (int) $floodInterval, $moderator, 0, $mail,
 		    $useMail, $usePruneUnreplied, (int) $pruneUnrepliedAge,
 		    $usePruneOld, (int) $pruneMaxAge, (int) $topicsPerPage,  $topicOrdering,
@@ -1073,11 +1073,7 @@
     }
 
     function register_forum_post($forumId, $parentId) {
-	if (!$parentId) {
-	    $query = "update `tiki_forums` set `threads`=`threads`+1, `comments`=`comments`+1 where `forumId`=?";
-	} else {
-	    $query = "update `tiki_forums` set `comments`=`comments`+1 where `forumId`=?";
-	}
+	$query = "update `tiki_forums` set `comments`=`comments`+1 where `forumId`=?";
 
 	$result = $this->query($query,array((int) $forumId));
 
@@ -1170,10 +1166,8 @@
 	if ($forum["usePruneUnreplied"] == 'y' || $forum["usePruneOld"] == 'y') {	// Recalculate comments and threads
 		$query = "select count(*) from `tiki_comments` where `objectType` = 'forum' and `object`=?";
 		$comments = $this->getOne($query, array( $forumId ) );
-		$query = "select count(*) from `tiki_comments` where `objectType` = 'forum' and `object`=? and `parentId`=0";
-		$threads = $this->getOne($query, array( $forumId ));
-		$query = "update `tiki_forums` set `comments`=?, `threads`=? where `forumId`=?";
-		$result = $this->query($query, array( (int) $comments, (int) $threads, (int) $forumId) );
+		$query = "update `tiki_forums` set `comments`=? where `forumId`=?";
+		$result = $this->query($query, array( (int) $comments, (int) $forumId) );
 	}
 	return true;
     }