';
+ $build['#prefix'] = $prefix;
+ }
+ return $build;
+}
+
+/**
+ * Builds a structured array representing the comment's content.
+ *
+ * The content built for the comment (field values, comments, file attachments or
+ * other comment components) will vary depending on the $build_mode parameter.
+ *
+ * @param $comment
+ * A comment object.
+ * @param $build_mode
+ * Build mode, e.g. 'full', 'teaser'...
+ *
+ * @return
+ * A structured array containing the individual elements
+ * of the comment's content.
+ */
+function comment_build_content($comment, $build_mode = 'full') {
+ if (empty($comment->content)) {
+ $comment->content = array();
+ }
+
+ // Build comment body.
+ $comment->content['comment_body'] = array(
+ '#markup' => check_markup($comment->comment, $comment->format, '', FALSE),
+ );
+
+ $comment->content['links']['comment'] = array(
+ '#theme' => 'links',
+ '#links' => comment_links($comment),
+ '#attributes' => array('class' => 'links inline'),
+ );
+
+ // Build fields content.
+ $comment->content += field_attach_view('comment', $comment, $build_mode);
+
+ // Allow modules to make their own additions to the comment.
+ module_invoke_all('comment_view', $comment, $build_mode);
+
+ // Allow modules to modify the structured comment.
+ drupal_alter('comment_build', $comment, $build_mode);
+
+ return $comment;
+}
+
+/**
+ * Construct a drupal_render() style array from an array of loaded comments.
+ *
+ * @param $comments
+ * An array of comments as returned by comment_load_multiple().
+ * @param $build_mode
+ * Build mode, e.g. 'full', 'teaser'...
+ * @param $weight
+ * An integer representing the weight of the first comment in the list.
+ * @return
+ * An array in the format expected by drupal_render().
+ */
+function comment_build_multiple($comments, $build_mode = 'full', $weight = 0) {
+ $build['comments']['prelude'] = array('#markup' => '', '#weight' => -20);
+ foreach ($comments as $comment) {
+ $build['comments'][$comment->cid] = comment_build($comment, $build_mode);
+ $build['comments'][$comment->cid]['#weight'] = $weight;
+ $weight++;
+ }
+ $build['comments'] += array(
+ '#sorted' => TRUE,
+ '#attributes' => array('id' => 'comments'),
+ '#theme_wrapper' => 'comment_wrapper',
+ );
+ return $build;
+}
+
+/**
* Implement hook_form_FORM_ID_alter().
*/
function comment_form_node_type_form_alter(&$form, $form_state) {
@@ -878,7 +1124,7 @@ function comment_save($comment) {
}
else {
// Add the comment to database. This next section builds the thread field.
- // Also see the documentation for comment_render().
+ // Also see the documentation for comment_build().
if ($comment->pid == 0) {
// This is a comment with no parent comment (depth 0): we start
// by retrieving the maximum thread level.
@@ -977,24 +1223,13 @@ function comment_link($type, $object, $build_mode) {
*
* @param $comment
* The comment to which the links will be related.
- * @param $return
- * Not used.
* @return
* An associative array containing the links.
*/
-function comment_links($comment, $return = 1) {
+function comment_links(&$comment) {
global $user;
$links = array();
- // If viewing just this comment, link back to the in-context view.
- if ($return) {
- $links['comment_parent'] = array(
- 'title' => t('parent'),
- 'href' => 'comment/' . $comment->cid,
- 'fragment' => "comment-$comment->cid"
- );
- }
-
$node = node_load($comment->nid);
if ($node->comment == COMMENT_NODE_OPEN) {
if (user_access('administer comments') && user_access('post comments')) {
@@ -1041,185 +1276,13 @@ function comment_links($comment, $return = 1) {
$links['comment_forbidden']['html'] = TRUE;
}
}
+
+
return $links;
}
/**
- * Renders comment(s).
- *
- * @param $node
- * The node which comment(s) needs rendering.
- * @param $cid
- * Optional, if given, only one comment is rendered.
- *
- * To display threaded comments in the correct order we keep a 'thread' field
- * and order by that value. This field keeps this data in
- * a way which is easy to update and convenient to use.
- *
- * A "thread" value starts at "1". If we add a child (A) to this comment,
- * we assign it a "thread" = "1.1". A child of (A) will have "1.1.1". Next
- * brother of (A) will get "1.2". Next brother of the parent of (A) will get
- * "2" and so on.
- *
- * First of all note that the thread field stores the depth of the comment:
- * depth 0 will be "X", depth 1 "X.X", depth 2 "X.X.X", etc.
- *
- * Now to get the ordering right, consider this example:
- *
- * 1
- * 1.1
- * 1.1.1
- * 1.2
- * 2
- *
- * If we "ORDER BY thread ASC" we get the above result, and this is the
- * natural order sorted by time. However, if we "ORDER BY thread DESC"
- * we get:
- *
- * 2
- * 1.2
- * 1.1.1
- * 1.1
- * 1
- *
- * Clearly, this is not a natural way to see a thread, and users will get
- * confused. The natural order to show a thread by time desc would be:
- *
- * 2
- * 1
- * 1.2
- * 1.1
- * 1.1.1
- *
- * which is what we already did before the standard pager patch. To achieve
- * this we simply add a "/" at the end of each "thread" value. This way, the
- * thread fields will look like this:
- *
- * 1/
- * 1.1/
- * 1.1.1/
- * 1.2/
- * 2/
- *
- * we add "/" since this char is, in ASCII, higher than every number, so if
- * now we "ORDER BY thread DESC" we get the correct order. However this would
- * spoil the reverse ordering, "ORDER BY thread ASC" -- here, we do not need
- * to consider the trailing "/" so we use a substring only.
- */
-function comment_render($node, $cid = 0) {
- global $user;
- $output = '';
-
- if (user_access('access comments')) {
- // Pre-process variables.
- $nid = $node->nid;
- if (empty($nid)) {
- $nid = 0;
- }
-
- $mode = _comment_get_display_setting('mode', $node);
- $comments_per_page = _comment_get_display_setting('comments_per_page', $node);
-
- if ($cid && is_numeric($cid)) {
- $comment = current(comment_load_multiple(array('cid' => $cid, 'status' => COMMENT_PUBLISHED)));
- // Single comment view.
- if ($comment) {
- $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
- $links = module_invoke_all('link', 'comment', $comment, 1);
- drupal_alter('link', $links, $node);
-
- $output .= theme('comment_view', $comment, $node, $links);
- }
- }
- // Only attempt to render comments if the node has visible comments.
- // Unpublished comments are not included in $node->comment_count, so show
- // comments unconditionally if the user is an administrator.
- elseif ($node->comment_count || user_access('administer comments')) {
-
- // Multiple comment view.
- $query = db_select('comment', 'c')->extend('PagerDefault');
- $query->addField('c', 'cid');
- $query
- ->condition('c.nid', $nid)
- ->addTag('node_access')
- ->limit($comments_per_page);
-
- $count_query = db_select('comment', 'c');
- $count_query->addExpression('COUNT(*)');
- $count_query
- ->condition('c.nid', $nid)
- ->addTag('node_access');
-
- if (!user_access('administer comments')) {
- $query->condition('c.status', COMMENT_PUBLISHED);
- $count_query->condition('c.status', COMMENT_PUBLISHED);
- }
- if ($mode === COMMENT_MODE_FLAT) {
- $query->orderBy('c.cid', 'ASC');
- }
- else {
- // See comment above. Analysis reveals that this doesn't cost too
- // much. It scales much much better than having the whole comment
- // structure.
- $query->orderBy('SUBSTRING(c.thread, 1, (LENGTH(c.thread) - 1))', 'ASC');
- }
-
- $query->setCountQuery($count_query);
- $cids = $query->execute()->fetchCol();
-
- $divs = 0;
- $num_rows = FALSE;
- $render = '';
- $comments = comment_load_multiple($cids);
- drupal_add_css(drupal_get_path('module', 'comment') . '/comment.css');
- foreach ($comments as $comment) {
- $comment = drupal_unpack($comment);
- $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
- $comment->depth = count(explode('.', $comment->thread)) - 1;
-
- if ($mode == COMMENT_MODE_THREADED) {
- if ($comment->depth > $divs) {
- $divs++;
- $render .= '
';
- }
- else {
- while ($comment->depth < $divs) {
- $divs--;
- $render .= '
';
- }
- }
- }
-
- if ($mode == COMMENT_MODE_FLAT) {
- $render .= theme('comment_flat_expanded', $comment, $node);
- }
- elseif ($mode == COMMENT_MODE_THREADED) {
- $render .= theme('comment_thread_expanded', $comment, $node);
- }
- $num_rows = TRUE;
- }
- while ($divs-- > 0) {
- $render .= '
' . $content . '
';
- return $output;
-}
-
-/**
* Form builder; Generate and validate a comment preview form.
*
* @ingroup forms
@@ -1885,65 +1932,24 @@ function comment_form_submit($form, &$form_state) {
}
/**
- * Theme a single comment block.
- *
- * @param $comment
- * The comment object.
- * @param $node
- * The comment node.
- * @param $links
- * An associative array containing control links.
- * @param $visible
- * Switches between folded/unfolded view.
- * @ingroup themeable
- */
-function theme_comment_view($comment, $node, $links = array(), $visible = TRUE) {
- $first_new = &drupal_static(__FUNCTION__, TRUE);
- $comment->new = node_mark($comment->nid, $comment->timestamp);
- $output = '';
-
- if ($first_new && $comment->new != MARK_READ) {
- // Assign the anchor only for the first new comment. This avoids duplicate
- // id attributes on a page.
- $first_new = FALSE;
- $output .= "