--- C:\Users\Ramesh\AppData\Local\Temp\forum_access.node.inc-revBASE.svn000.tmp.inc	2010-07-09 15:04:43.000000000 +-0100
+++ Q:\nbc\kola_rnair\src\sites\all\modules\forum_access\forum_access.node.inc	2010-07-09 14:31:43.000000000 +-0100
@@ -195,24 +195,17 @@
 /**
  * Recreate comment links (they've already been themed), and
  * remove those that aren't accessible to the user.
  */
 function _forum_access_preprocess_comment(&$variables) {
   global $user;
-  if (!empty($user->_forum_access_moderator)) {
-    _forum_access_enable_moderator();  // this allows us to retrieve the comment links (without setting precedent!)
-  }
 
-  $tid = $variables['node']->tid;
-  $links = module_invoke_all('link', 'comment', $variables['comment'], 0);
+  $tid = $variables['node']->tid;
+  $links = module_invoke_all('link', 'comment', $variables['comment'], 0);
 
-  if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == NULL) {
-    _forum_access_disable_moderator();
-  }
-
-  if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !forum_access_access($tid, 'create', NULL, FALSE))) {
+  if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !forum_access_access($tid, 'create', NULL, FALSE))) {
     unset($links['comment_reply']);
   }
   if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', NULL, FALSE) && !comment_access('edit', $variables['comment'])) {
     unset($links['comment_edit']);
   }
   if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', NULL, FALSE)) {