diff -u b/node_notify.module b/node_notify.module --- b/node_notify.module +++ b/node_notify.module @@ -845,7 +845,7 @@ $log_message = FALSE; $variables = array( - '!comment' => l(check_plain($comment->subject), 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)), + '!comment' => l($comment->subject, 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)), '!node_uri' => url('node/' . $comment->nid), '!subscriber' => $subscription->uid > 0 ? l(t('user'), 'user/' . $subscription->uid) : check_plain($subscription->email), ); @@ -880,7 +880,7 @@ watchdog('node_notify', 'Unknown notification state @state. Comment !comment. Subscription @sid.', array( '@state' => $notification->notified, '@sid' => $subscription->sid, - '!comment' => l(check_plain($comment->subject), comment_uri($comment)), + '!comment' => l($comment->subject, comment_uri($comment)), ), WATCHDOG_ERROR); } } diff -u b/node_notify.pages.inc b/node_notify.pages.inc --- b/node_notify.pages.inc +++ b/node_notify.pages.inc @@ -35,7 +35,7 @@ return drupal_get_form('node_notify_subscribe_form', $node); } elseif (!node_notify_check_token('subscribe', $node->nid)) { - drupal_access_denied(); + return MENU_ACCESS_DENIED; } else { node_notify_subscribe($node->nid, $GLOBALS['user']->uid); @@ -89,7 +89,7 @@ drupal_goto('node/' . $node->nid); } else { - drupal_access_denied(); + return MENU_ACCESS_DENIED; } }