Index: comment_perm.info
===================================================================
--- comment_perm.info	(revision 576)
+++ comment_perm.info	(working copy)
@@ -1,7 +1,7 @@
 ; $Id: 
 name = Comment Permissions
 description = Control commenting permissions by role AND by node type.
-dependencies = comment
+dependencies[] = comment
 ; Information added by drupal.org packaging script on 2008-11-24
 version = "6.x-1.x-dev"
 core = "6.x"
Index: comment_perm.module
===================================================================
--- comment_perm.module	(revision 576)
+++ comment_perm.module	(working copy)
@@ -4,20 +4,18 @@
 /**
  * Implementation of hook_menu().
  */
-function comment_perm_menu($may_cache) {
+function comment_perm_menu() {
   $items = array();
   
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/content/comment_perm',
-      'title' => t('Comment permissions'),
-      'description' => t('Setup comment permissions by user role and by node type.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => 'comment_perm_admin_settings',
-      'access' => user_access('administer site configuration'),
-      'type' => MENU_NORMAL_ITEM
-    );
-  }
+  $items['admin/content/comment_perm'] = array(
+    'title' => 'Comment permissions',
+    'description' => 'Setup comment permissions by user role and by node type.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('comment_perm_admin_settings'),
+    'access arguments' => array('administer site configuration'),
+    'type' => MENU_NORMAL_ITEM
+  );
+
   return $items;
 }
 
@@ -27,10 +25,12 @@
 function comment_perm_admin_settings() {
   $form = array();
   $form['help'] = array(
-    '#value' => t("<p>Enable the extended comment permissions for certain content types here.
-      Then go to the !user-access-control to configure which roles can post comments for the
-      these content types.</p>",
-      array('!user-access-control' => l('user access control', 'admin/user/access')))
+    '#prefix' => '<p>',
+    '#value' => t('Enable the extended comment permissions for certain content types here.
+      Then go to the !administer_permissions to configure which roles can post comments for the
+      these content types.',
+      array('!administer_permissions' => l('administer permissions', 'admin/user/permissions'))),
+    '#suffix' => '</p>'
   );
   
   // get node types
@@ -108,7 +108,7 @@
 /**
  * Implementation of hook_form_alter().
  */
-function comment_perm_form_alter($form_id, &$form) {
+function comment_perm_form_alter(&$form, $form_state, $form_id) {
   if ($form_id == 'comment_form') {
     $nid = $form['nid']['#value'];
     if (!comment_perm_access($nid)) {
@@ -146,9 +146,13 @@
 /**
  * Implementation of hook_link_alter().
  */
-function comment_perm_link_alter(&$node, &$links) {
+function comment_perm_link_alter(&$links, $node) {
   if (!comment_perm_access($node)) {
     unset($links['comment_add']);
+    
+    if (module_exists('quote')) {
+        unset($links['quote']);
+    }
   }
 }