Index: content_admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/content_admin.inc,v
retrieving revision 1.15
diff -u -r1.15 content_admin.inc
--- content_admin.inc	21 May 2006 21:37:31 -0000	1.15
+++ content_admin.inc	1 Jun 2006 14:28:12 -0000
@@ -48,7 +48,7 @@
 
     $types = array();
     $result = db_query("SELECT nt.label FROM {node_field_instance} nfi LEFT JOIN {node_type} nt ON nt.type_name = nfi.type_name WHERE nfi.field_name = '%s' ORDER BY nt.label ASC", $field['field_name']);
-    while ($type = db_fetch_object($result)) {
+    while ($type = db_fetch_array($result)) {
       $types[] = $type['label'];
     }
     $row[] = implode (', ', $types);
@@ -74,7 +74,7 @@
       $type = $types[$original_type_name];
     }
     else {
-      $type = new stdClass();
+      $type = array();
       $type['label'] = '';
       $type['description'] = '';
       $type['help'] = '';