diff options
Diffstat (limited to 'modules/queue.module')
| -rw-r--r-- | modules/queue.module | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/queue.module b/modules/queue.module index f27b5b56a..8593bec83 100644 --- a/modules/queue.module +++ b/modules/queue.module @@ -25,7 +25,7 @@ function queue_perm() { function queue_link($type) { if ($type == "menu.view" && user_access("access submission queue")) { - $links[] = lm(t("view submissions"), array("mod" => "queue"), "", array("title" => t("Moderate the content in the submission queue."))) ." (<span style=\"color: red;\">". queue_count() ."</span>)"; + $links[] = l(t("view submissions"), "queue", array("title" => t("Moderate the content in the submission queue."))) ." (<span style=\"color: red;\">". queue_count() ."</span>)"; } return $links ? $links : array(); @@ -88,10 +88,10 @@ function queue_overview() { $output .= " <tr><th>". t("Subject") ."</th><th>". t("Author") ."</th><th>". t("Type") ."</th><th>". t("Score") ."</th></tr>"; while ($node = db_fetch_object($result)) { if ($user->uid == $node->uid || field_get($node->users, $user->uid)) { - $output .= " <tr><td>". lm($node->title, array("mod" => "queue", "op" => "view", "id" => $node->nid)) ."</td><td align=\"center\">". format_name($node) ."</td><td align=\"center\">". module_invoke($node->type, "node", "name") ."</td><td align=\"center\">". queue_score($node->nid) ."</td></tr>"; + $output .= " <tr><td>". l($node->title, "queue/$node->nid") ."</td><td align=\"center\">". format_name($node) ."</td><td align=\"center\">". module_invoke($node->type, "node", "name") ."</td><td align=\"center\">". queue_score($node->nid) ."</td></tr>"; } else { - $output .= " <tr><td>". lm($node->title, array("mod" => "queue", "op" => "view", "id" => $node->nid)) ."</td><td align=\"center\">". format_name($node) ."</td><td align=\"center\">". module_invoke($node->type, "node", "name") ."</td><td align=\"center\">". lm(t("vote"), array("mod" => "queue", "op" => "view", "id" => $node->nid)) ."</td></tr>"; + $output .= " <tr><td>". l($node->title, "queue/$node->nid") ."</td><td align=\"center\">". format_name($node) ."</td><td align=\"center\">". module_invoke($node->type, "node", "name") ."</td><td align=\"center\">". l(t("vote"), "queue/$node->nid") ."</td></tr>"; } if ($node->teaser) { @@ -161,11 +161,11 @@ function queue_view($nid) { } function queue_page() { - global $user, $id, $op, $theme, $vote; + global $user, $theme, $vote; if ($user->uid && user_access("access submission queue")) { - if ($op) { - queue_view(check_input($id)); + if (arg(1)) { + queue_view(check_input(arg(1))); } else { queue_overview(); @@ -184,7 +184,7 @@ function queue_block($op = "list", $delta = 0) { return $blocks; } else { - if (user_access("access submission queue") && (substr_count(request_uri(), drupal_url(array("mod" => "queue"), "module")) || substr_count(request_uri(), drupal_url()))) { + if (user_access("access submission queue") && (substr_count(request_uri(), url("queue")) || substr_count(request_uri(), url()))) { global $user, $id; if ($user->uid) { $node = node_load(array("nid" => $id)); @@ -202,7 +202,7 @@ function queue_block($op = "list", $delta = 0) { $block["content"] = $output ? $output : t("This node has not been moderated yet."); } } - elseif ((user_access("access submission queue") || user_access("administer blocks")) && (substr_count(request_uri(), drupal_url(array("mod" => "user"), "module")) || substr_count(request_uri(), drupal_url(array(), "admin")))) { + elseif ((user_access("access submission queue") || user_access("administer blocks")) && (substr_count(request_uri(), url("user")) || substr_count(request_uri(), url("admin")))) { $block["subject"] = t("Moderation results"); } |