- Changed field_set(), field_get() and field_merge() to use ',' and

  '=' instead of ';' and ':'.  It is considered to be more readable.
  --> A _first_ step towards and improved index.module.  Stay tuned
      for more.

  + Important:
     If you update from CVS - apply the queries in 2.00-to-x.xx.sql!

- Changed all 'attribute' to 'attributes'.

  + Important:
     If you update from CVS - apply the queries in 2.00-to-x.xx.sql!

  + Important:
     This might require to ieni-wieni small update to your custom
     themes and/or node-related modules:
      - themes: node_index($node->attribute) -> node_index($node)
      - node modules: attribute -> attributes

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index 6b1df2c82..ffbca0d0c 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -5,7 +5,7 @@ class Node {
     global $user;
     $this->userid = $node[userid] ? $node[userid] : $user->userid;
     $this->title = $node[title];
-    $this->timestamp = $node[attribute];
+    $this->timestamp = $node[attributes];
     $this->timestamp = $node[timestamp] ? $node[timestamp] : time();
   }
 }
@@ -83,7 +83,7 @@ function node_overview($query) {
 
     $bg = $color[$i++ % sizeof($color)];
 
-    $output .= " <TR BGCOLOR=\"$bg\"><TD><A HREF=\"node.php?id=$node->nid\">". check_output($node->title) ."</A></TD><TD ALIGN=\"center\">$node->type</TD><TD>". node_status($node->status) ."</TD><TD>". check_output($node->attribute) ."</TD><TD>". format_username($node->userid) ."</TD><TD>". format_date($node->timestamp, "small") ."</TD></TR>\n";
+    $output .= " <TR BGCOLOR=\"$bg\"><TD><A HREF=\"node.php?id=$node->nid\">". check_output($node->title) ."</A></TD><TD ALIGN=\"center\">$node->type</TD><TD>". node_status($node->status) ."</TD><TD>". check_output($node->attributes) ."</TD><TD>". format_username($node->userid) ."</TD><TD>". format_date($node->timestamp, "small") ."</TD></TR>\n";
     $output .= " <TR BGCOLOR=\"$bg\"><TD ALIGN=\"right\" COLSPAN=\"6\"><SMALL>". implode(", ", $link) ."</SMALL></TD>\n";
   }
   $output .= "</TABLE>\n";
@@ -112,7 +112,7 @@ function node_edit_attribute($id) {
   $node = node_get_object(array("nid" => $id));
 
   $form .= form_item("Document title", check_output($node->title));
-  $form .= form_textfield("Attributes", "attribute", $node->attribute, 50, 128, htmlentities("A list meta attributes.  Format: <type>:<value>;<type>:<value>;.  Example: 'software:apache;type:webserver;os:linux;'."));
+  $form .= form_textfield("Attributes", "attributes", $node->attributes, 50, 128, htmlentities("A list meta attributes.  Format: <type>:<value>;<type>:<value>;.  Example: 'software:apache;type:webserver;os:linux;'."));
   $form .= form_hidden("nid", $node->nid);
   $form .= form_submit("Save node");
 
@@ -204,8 +204,8 @@ function node_admin_save($edit) {
     $edit[timestamp_hidden] = (strtotime($edit[timestamp_hidden]) > time()) ? strtotime($edit[timestamp_hidden]) : 0;
     node_save($edit, array(status, timestamp_posted, timestamp_queued, timestamp_hidden));
   }
-  else if (isset($edit[attribute])) {
-    node_save($edit, array(attribute));
+  else if (isset($edit[attributes])) {
+    node_save($edit, array(attributes));
   }
   else {
     node_save($edit, array(comment, moderate, promote));