- fixed small glitch in node_del()

- fixed small glitch in comment_del()

- changed the API of the form() function.  The first parameter, the
  "action"-attribute in the <form>-tag has been made optional.  By
  default, it will be set to "$REQUEST_URI".

  Why? Because in 98% of the cases we would do:

    global $REQUEST_URI;
    $form = form($REQUEST_URI, $form_content);

  while we can do:

    $form = form($form_content);

  now.

  Update your modules (and sorry for the inconvenience)!

1 files changed, 2 insertions, 1 deletions

diff --git a/includes/node.inc b/includes/node.inc
index bc138b34d..b820511a9 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -53,6 +53,7 @@ function node_del($conditions) {
     db_query("DELETE FROM node WHERE nid = '$node->nid'");
     db_query("DELETE FROM $node->type WHERE lid = '$node->lid' AND nid = '$node->nid'");
     db_query("DELETE FROM comments WHERE lid = '$node->nid'");
+    db_query("DELETE FROM moderate WHERE nid = '$node->nid'");
     watchdog("special", "node: deleted '$node->title'");
     return $node;
   }
@@ -199,7 +200,7 @@ function node_control($node) {
   }
 
   $output .= "<FORM METHOD=\"get\" ACTION=\"\">\n";
-  foreach ($choices as $key => $value) $options .= "<OPTION VALUE=\"$key\"". (strstr($REQUEST_URI,"/$key") ? " SELECTED" : "") .">". check_form($value) ."</OPTION>\n";
+  foreach ($choices as $key => $value) $options .= "<OPTION VALUE=\"$key\"". (strstr($REQUEST_URI, "/$key") ? " SELECTED" : "") .">". check_form($value) ."</OPTION>\n";
   $output .= " <SELECT NAME=\"op\" ONCHANGE=\"visit(this.options[this.selectedIndex].value)\">$options</SELECT>\n";
   $output .= "</FORM>\n";