diff options
Diffstat (limited to 'modules/comment/comment.module')
| -rw-r--r-- | modules/comment/comment.module | 123 |
1 files changed, 48 insertions, 75 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 526525601..7725ea6ae 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -822,9 +822,56 @@ function comment_build_content($comment, $build_mode = 'full') { $comment->content += field_attach_view('comment', $comment, $build_mode); if (empty($comment->in_preview)) { + $links = array(); + $node = node_load($comment->nid); + if ($node->comment == COMMENT_NODE_OPEN) { + if (user_access('administer comments') && user_access('post comments')) { + $links['comment_delete'] = array( + 'title' => t('delete'), + 'href' => "comment/delete/$comment->cid", + 'html' => TRUE, + ); + $links['comment_edit'] = array( + 'title' => t('edit'), + 'href' => "comment/edit/$comment->cid", + 'html' => TRUE, + ); + $links['comment_reply'] = array( + 'title' => t('reply'), + 'href' => "comment/reply/$comment->nid/$comment->cid", + 'html' => TRUE, + ); + if ($comment->status == COMMENT_NOT_PUBLISHED) { + $links['comment_approve'] = array( + 'title' => t('approve'), + 'href' => "comment/approve/$comment->cid", + 'html' => TRUE, + ); + } + } + elseif (user_access('post comments')) { + if (comment_access('edit', $comment)) { + $links['comment_edit'] = array( + 'title' => t('edit'), + 'href' => "comment/edit/$comment->cid", + 'html' => TRUE, + ); + } + $links['comment_reply'] = array( + 'title' => t('reply'), + 'href' => "comment/reply/$comment->nid/$comment->cid", + 'html' => TRUE, + ); + } + else { + $links['comment_forbidden']['title'] = theme('comment_post_forbidden', $node); + $links['comment_forbidden']['html'] = TRUE; + } + } + $comment->content['links']['comment'] = array( '#theme' => 'links', - '#links' => comment_links($comment), + '#links' => $links, '#attributes' => array('class' => 'links inline'), ); } @@ -1324,80 +1371,6 @@ function comment_delete_multiple($cids) { } /** - * Implement hook_link(). - */ -function comment_link($type, $object, $build_mode) { - if ($type == 'comment') { - $links = comment_links($object, FALSE); - return $links; - } -} - -/** - * Build command links for a comment (e.g.\ edit, reply, delete) with respect to the current user's access permissions. - * - * @param $comment - * The comment to which the links will be related. - * @return - * An associative array containing the links. - */ -function comment_links(&$comment) { - global $user; - $links = array(); - - $node = node_load($comment->nid); - if ($node->comment == COMMENT_NODE_OPEN) { - if (user_access('administer comments') && user_access('post comments')) { - $links['comment_delete'] = array( - 'title' => t('delete'), - 'href' => "comment/delete/$comment->cid", - 'html' => TRUE, - ); - $links['comment_edit'] = array( - 'title' => t('edit'), - 'href' => "comment/edit/$comment->cid", - 'html' => TRUE, - ); - $links['comment_reply'] = array( - 'title' => t('reply'), - 'href' => "comment/reply/$comment->nid/$comment->cid", - 'html' => TRUE, - ); - if ($comment->status == COMMENT_NOT_PUBLISHED) { - $links['comment_approve'] = array( - 'title' => t('approve'), - 'href' => "comment/approve/$comment->cid", - 'html' => TRUE, - ); - } - } - elseif (user_access('post comments')) { - if (comment_access('edit', $comment)) { - $links['comment_edit'] = array( - 'title' => t('edit'), - 'href' => "comment/edit/$comment->cid", - 'html' => TRUE, - ); - } - $links['comment_reply'] = array( - 'title' => t('reply'), - 'href' => "comment/reply/$comment->nid/$comment->cid", - 'html' => TRUE, - ); - } - else { - $node = node_load($comment->nid); - $links['comment_forbidden']['title'] = theme('comment_post_forbidden', $node); - $links['comment_forbidden']['html'] = TRUE; - } - } - - - - return $links; -} - -/** * Comment operations. Offer different update operations depending on * which comment administration page is being viewed. * |