376,380d375
<   $nodetypes = array();
<   foreach (node_list() as $type) {
<     $nodetypes[$type] = node_invoke($type, 'node_name');
<   }
< 
388,389c383,384
<   foreach ($nodetypes as $internal_type => $type) {
<     $node_checkboxes .= form_checkbox($type, 'pub_' . $internal_type, $internal_type, in_array($internal_type, $published));
---
>   foreach (node_get_types() as $internal_type => $type) {
>     $node_checkboxes .= form_checkbox($type, 'pub_' . $type, $type, in_array($type, $published));
677,678c672,673
<   foreach (node_list() as $type) {
<     $nodetypes[$type] = node_invoke($type, 'node_name');
---
>   foreach (node_get_types() as $type => $name) {
>     $nodetypes[$type] = $name;
689,690c684,685
<   foreach ($nodetypes as $internal_type => $type) {
<     $node_checkboxes .= form_checkbox($type, 'pub_' . $internal_type, $internal_type, in_array($internal_type, $published));
---
>   foreach ($nodetypes as $type => $internal_type) {
>     $node_checkboxes .= form_checkbox($internal_type, 'pub_' . $internal_type, $type, in_array($type, $published));
708,711c703,706
<   foreach (node_list() as $type) {
<     $nodetypes[$type] = node_invoke($type, 'node_name');
<     if ($edit['pub_' . $type]) {
<       $submitted_nodetypes[$type] = $type;
---
>   foreach (node_get_types() as $type => $name) {
>     $nodetypes[$type] = node_invoke($name, 'node_name');
>     if ($edit['pub_' . $name]) {
>       $submitted_nodetypes[$type] = $name;
1427,1431c1422,1426
<     $node = node_load(array('nid' => $id));
<     unset($node['data']);
<     unset($node['revisions']);
<     unset($node['picture']);
<     unset($node['workspaces']);
---
>     $node = node_load($id);
>     unset ($node->data);
>     unset ($node->revisions);
>     unset ($node->picture);
>     unset ($node->workspaces);