Mercurial > defr > drupal > core

comparison modules/comment/comment.module @ 7:fff6d4c8c043 6.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drupal 6.3
author Franck Deroche <webmaster@defr.org>
date Tue, 23 Dec 2008 14:30:28 +0100
parents 2427550111ae
children 589fb7c02327
comparison
equal deleted inserted replaced
6:2cfdc3c92142 7:fff6d4c8c043
1 <?php 1 <?php
2 // $Id: comment.module,v 1.617.2.1 2008/04/09 21:11:46 goba Exp $ 2 // $Id: comment.module,v 1.617.2.2 2008/04/25 20:58:46 goba Exp $
3 3
4 /** 4 /**
5 * @file 5 * @file
6 * Enables users to comment on published content. 6 * Enables users to comment on published content.
7 * 7 *
952 $output .= theme('comment_view', $comment, $node, $links); 952 $output .= theme('comment_view', $comment, $node, $links);
953 } 953 }
954 } 954 }
955 else { 955 else {
956 // Multiple comment view 956 // Multiple comment view
957 $query_count = 'SELECT COUNT(*) FROM {comments} WHERE nid = %d'; 957 $query_count = 'SELECT COUNT(*) FROM {comments} c WHERE c.nid = %d';
958 $query = 'SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.signature, u.picture, u.data, c.thread, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d'; 958 $query = 'SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.signature, u.picture, u.data, c.thread, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d';
959 959
960 $query_args = array($nid); 960 $query_args = array($nid);
961 if (!user_access('administer comments')) { 961 if (!user_access('administer comments')) {
962 $query .= ' AND c.status = %d'; 962 $query .= ' AND c.status = %d';
963 $query_count .= ' AND status = %d'; 963 $query_count .= ' AND c.status = %d';
964 $query_args[] = COMMENT_PUBLISHED; 964 $query_args[] = COMMENT_PUBLISHED;
965 } 965 }
966 966
967 if ($order == COMMENT_ORDER_NEWEST_FIRST) { 967 if ($order == COMMENT_ORDER_NEWEST_FIRST) {
968 if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) { 968 if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) {