- 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, 12 insertions, 12 deletions

diff --git a/includes/common.inc b/includes/common.inc
index a60ca3236..1702ccb32 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -197,8 +197,8 @@ function form_submit($value) {
 }
 
 function field_get($string, $name) {
-  foreach (explode(";", $string) as $data) {
-    $entry = explode(":", $data);
+  foreach (explode(",", $string) as $data) {
+    $entry = explode("=", $data);
     if ($entry[0] == $name) return $entry[1];
   }
 }
@@ -206,30 +206,30 @@ function field_get($string, $name) {
 function field_set($string, $name, $value) {
   if (!$value) {
     // remove entry:
-    foreach (explode(";", $string) as $data) {
-      $entry = explode(":", $data);
-      if ($entry[0] != $name) $rval .= "$entry[0]:$entry[1];";
+    foreach (explode(",", $string) as $data) {
+      $entry = explode("=", $data);
+      if ($entry[0] != $name) $rval .= "$entry[0]=$entry[1],";
     }
   }
-  else if (strstr($string, "$name:")) {
+  else if (strstr($string, "$name=")) {
     // found: update exsisting entry:
-    foreach (explode(";", $string) as $data) {
-      $entry = explode(":", $data);
+    foreach (explode(",", $string) as $data) {
+      $entry = explode("=", $data);
       if ($entry[0] == $name) $entry[1] = $value;
-      $rval .= "$entry[0]:$entry[1];";
+      $rval .= "$entry[0]=$entry[1],";
     }
   }
   else {
     // not found:
-    $rval = "$string$name:$value;";
+    $rval = "$string$name=$value,";
   }
 
   return $rval;
 }
 
 function field_merge($a, $b) {
-  foreach (explode(";", $b) as $data) {
-    $entry = explode(":", $data);
+  foreach (explode(",", $b) as $data) {
+    $entry = explode("=", $data);
     $a = field_set($a, $entry[0], $entry[1]);
   }
   return $a;