Skip to content

GitLab

D
drupal
Commit d259cc19 authored by Dries's avatar Dries
Browse files
Options 

- Commited Moshe's comment moderation improvements.
parent 56d72a91
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/comment.module
View file @ d259cc19
......@@ -301,7 +301,7 @@ function comment_links($comment, $return = 1) {
global $user, $theme;
$links = array();
/*
** If we are viewing just this comment, we link back to the node
*/
......@@ -314,7 +314,7 @@ function comment_links($comment, $return = 1) {
** Admin link
*/
if (user_access("administer comments")) {
if (user_access("administer comments") && user_access("access administration pages")) {
$links[] = la(t("administer"), array("mod" => "comment", "op" => "edit", "id" => $comment->cid));
// $links[] = lm(t("unpublish"), array ("mod" => "comment", "op" => "Moderate comment", "moderation[$comment->cid]" => "offline", "edit[nid]" => $comment->nid), "", array ("title" => t("hide this comment by marking it non-published")));
}
......@@ -414,7 +414,7 @@ function comment_render($node, $cid = 0) {
comment_view($comment, comment_links($comment));
}
if ((user_access("administer comments") || comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
if ((comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
print "<div align=\"center\">". form_submit(t("Moderate comment")) ."</div><br />";
}
print "</form>";
......@@ -1154,7 +1154,7 @@ function comment_moderation_form($comment) {
// preview comment:
$output .= "&nbsp;";
}
else if ((user_access("administer comments") || comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
else if ((comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
// comment hasn't been moderated yet:
if (!isset($votes)) {
......
modules/comment/comment.module
View file @ d259cc19
......@@ -301,7 +301,7 @@ function comment_links($comment, $return = 1) {
global $user, $theme;
$links = array();
/*
** If we are viewing just this comment, we link back to the node
*/
......@@ -314,7 +314,7 @@ function comment_links($comment, $return = 1) {
** Admin link
*/
if (user_access("administer comments")) {
if (user_access("administer comments") && user_access("access administration pages")) {
$links[] = la(t("administer"), array("mod" => "comment", "op" => "edit", "id" => $comment->cid));
// $links[] = lm(t("unpublish"), array ("mod" => "comment", "op" => "Moderate comment", "moderation[$comment->cid]" => "offline", "edit[nid]" => $comment->nid), "", array ("title" => t("hide this comment by marking it non-published")));
}
......@@ -414,7 +414,7 @@ function comment_render($node, $cid = 0) {
comment_view($comment, comment_links($comment));
}
if ((user_access("administer comments") || comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
if ((comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
print "<div align=\"center\">". form_submit(t("Moderate comment")) ."</div><br />";
}
print "</form>";
......@@ -1154,7 +1154,7 @@ function comment_moderation_form($comment) {
// preview comment:
$output .= "&nbsp;";
}
else if ((user_access("administer comments") || comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
else if ((comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
// comment hasn't been moderated yet:
if (!isset($votes)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment