- Patch #606608 by q0rban, sun, David_Rothstein: use proper menu router paths for comment/*.

1 files changed, 1 insertions, 22 deletions

diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc
index 150d0f71b..ddabc017c 100644
--- a/modules/comment/comment.admin.inc
+++ b/modules/comment/comment.admin.inc
@@ -90,7 +90,7 @@ function comment_admin_overview($form, &$form_state, $arg) {
       'author' => theme('username', array('account' => $comment)),
       'posted_in' => l($comment->node_title, 'node/' . $comment->nid),
       'changed' => format_date($comment->changed, 'short'),
-      'operations' => l(t('edit'), 'comment/edit/' . $comment->cid, array('query' => $destination)),
+      'operations' => l(t('edit'), 'comment/' . $comment->cid .'/edit', array('query' => $destination)),
     );
   }
 
@@ -206,27 +206,6 @@ function comment_multiple_delete_confirm_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; delete a comment.
- *
- * @param $cid
- *   The comment to be deleted.
- */
-function comment_delete_page($cid = NULL) {
-  $comment = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comment} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = :cid', array(':cid' => $cid))->fetch();
-  $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
-  $output = '';
-
-  if (is_object($comment) && is_numeric($comment->cid)) {
-    $output = drupal_get_form('comment_confirm_delete', $comment);
-  }
-  else {
-    drupal_set_message(t('The comment no longer exists.'));
-  }
-
-  return $output;
-}
-
-/**
  * Form builder; Builds the confirmation form for deleting a single comment.
  *
  * @ingroup forms