Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.498
diff -u -Ftion -r1.498 common.inc
--- includes/common.inc	11 Dec 2005 12:31:17 -0000	1.498
+++ includes/common.inc	14 Dec 2005 18:53:04 -0000
@@ -499,33 +499,14 @@ function fix_gpc_magic() {
  * Convert an associative array to an anonymous object.
  */
 function array2object($array) {
-  if (is_array($array)) {
-    $object = new StdClass();
-    foreach ($array as $key => $value) {
-      $object->$key = $value;
-    }
-  }
-  else {
-    $object = $array;
-  }
-
-  return $object;
+  return (object) $array;
 }
 
 /**
  * Convert an object to an associative array.
  */
 function object2array($object) {
-  if (is_object($object)) {
-    foreach ($object as $key => $value) {
-      $array[$key] = $value;
-    }
-  }
-  else {
-    $array = $object;
-  }
-
-  return $array;
+  return (array) $object;
 }