[geeklog-cvs] geeklog: Fixed view of a comment when topic permissions come int...

[geeklog-cvs at lists.geeklog.net]

changeset 8467:2f849bb5954d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2f849bb5954d
user: Tom <websitemaster at cogeco.net>
date: Mon Jan 02 13:32:09 2012 -0500
description:
Fixed view of a comment when topic permissions come into play.

diffstat:

 public_html/comment.php |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (16 lines):

diff -r 90650c1f1d06 -r 2f849bb5954d public_html/comment.php
--- a/public_html/comment.php	Mon Jan 02 13:28:45 2012 -0500
+++ b/public_html/comment.php	Mon Jan 02 13:32:09 2012 -0500
@@ -257,9 +257,9 @@
     switch ( $type ) {
         case 'article':
             $sql = 'SELECT COUNT(*) AS count, commentcode, owner_id, group_id, perm_owner, perm_group, '
-                 . "perm_members, perm_anon FROM {$_TABLES['stories']} WHERE (sid = '$sid') "
-                 . 'AND (draft_flag = 0) AND (commentcode >= 0) AND (date <= NOW())' . COM_getPermSQL('AND') 
-                 . COM_getTopicSQL('AND') . ' GROUP BY sid,owner_id, group_id, perm_owner, perm_group,perm_members, perm_anon ';
+                 . "perm_members, perm_anon FROM {$_TABLES['stories']}, {$_TABLES['topic_assignments']} ta WHERE (sid = '$sid') "
+                 . 'AND (draft_flag = 0) AND (commentcode >= 0) AND (date <= NOW()) AND ta.type = "article" AND ta.id = sid ' . COM_getPermSQL('AND') 
+                 . COM_getTopicSQL('AND', 0, 'ta') . ' GROUP BY sid, owner_id, group_id, perm_owner, perm_group,perm_members, perm_anon ';
             $result = DB_query ($sql);
             $B = DB_fetchArray ($result);
             $allowed = $B['count'];