summaryrefslogtreecommitdiff
path: root/modules/queue.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/queue.module')
-rw-r--r--modules/queue.module14
1 files changed, 2 insertions, 12 deletions
diff --git a/modules/queue.module b/modules/queue.module
index ea1ba0b11..aa70ef656 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -51,7 +51,7 @@ function queue_vote($id, $vote) {
}
else if (variable_get($node->type ."_dump", -2) >= $node->score) {
if ($node->revisions) {
- node_revision_rollback($node->nid, node_revision_previous($node));
+ node_revision_rollback($node, end(node_revision_list($node)));
watchdog("special", "moderation: dumped '$node->title' (rollback)");
}
else {
@@ -61,7 +61,7 @@ function queue_vote($id, $vote) {
}
else if (variable_get($node->type ."_expire", 6) <= $node->votes) {
if ($node->revisions) {
- node_revision_rollback($node->nid, node_revision_previous($node));
+ node_revision_rollback($node, end(node_revision_list($node)));
watchdog("special", "moderation: expired '$node->title' (rollback)");
}
else {
@@ -108,16 +108,6 @@ function queue_view($id) {
*/
$queue_votes = array("neutral (+0)" => "+ 0", "post it (+1)" => "+ 1", "dump it (-1)" => "- 1");
- // TODO: this is where the upcoming versioning system should come in
- if ($n = node_load(array("nid" => $node->pid))) {
- $output .= " ". t("The above node is a proposed update of an existing node:") ." \"<a href=\"node.php?id=$n->nid\">". check_output($n->title) ."</a>\".";
- }
-
- // TODO: this is where the upcoming versioning system should come in
- if ($node->log) {
- $output .= " ". t("The log message to accompany this submission is given below:") ."<p><i>". check_output($node->log, 1) ."</i></p>";
- }
-
// moderation form:
$output .= "<form action=\"module.php?mod=queue\" method=\"post\">";
foreach ($queue_votes as $key=>$value) $options .= " <option value=\"$value\">$key</option>";