includes/comment.php
changeset 326 ab66d6d1f1f4
parent 322 5f1cd51bf1be
child 328 dc838fd61a06
child 456 e133d321fce4
--- a/includes/comment.php	Fri Dec 07 18:47:37 2007 -0500
+++ b/includes/comment.php	Wed Dec 19 22:55:40 2007 -0500
@@ -2,7 +2,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
+ * Version 1.0.3 (Dyrad)
  * Copyright (C) 2006-2007 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
@@ -54,7 +54,7 @@
     global $db, $session, $paths, $template, $plugins; // Common objects
     
     // Initialize permissions
-    if ( $page_id == $paths->cpage['urlname_nons'] && $namespace == $paths->namespace )
+    if ( $page_id == $paths->page_id && $namespace == $paths->namespace )
       $this->perms =& $GLOBALS['session'];
     else
       $this->perms = $session->fetch_page_acl($page_id, $namespace);
@@ -113,7 +113,7 @@
                                  ON ( ( b.user_id=' . $session->user_id.' AND b.buddy_user_id=c.user_id ) OR b.user_id IS NULL)
                                WHERE page_id=\'' . $this->page_id . '\'
                                  AND namespace=\'' . $this->namespace . '\'
-                               GROUP BY c.comment_id
+                               GROUP BY c.comment_id,c.name,c.subject,c.comment_data,c.time,c.approved,u.user_level,u.user_id,u.signature,b.buddy_id,b.is_friend
                                ORDER BY c.time ASC;');
         $count_appr = 0;
         $count_total = 0;