Index: workspace.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workspace/workspace.module,v
retrieving revision 1.19
diff -u -r1.19 workspace.module
--- workspace.module	9 Sep 2005 16:41:28 -0000	1.19
+++ workspace.module	9 Oct 2005 04:15:18 -0000
@@ -94,13 +94,12 @@
       break;
 
     default:
-      
       $output = workspace_list();
   }
  
   $title = t('workspace') . ' : ' . $user->name;
   drupal_set_title($title);
-  print theme('page', $output);
+  return $output;
 }
 
 function workspace_configure() {
@@ -119,8 +118,8 @@
   }
   $output = workspace_configure_form($edit);
 
-  $title = t('workspace : %username', array('%username' => $user->name));
-  print theme('page', $output, $title);
+  drupal_set_title(t('workspace : %username', array('%username' => $user->name)));
+  return $output;
 }
 
 /********************************************************************
@@ -142,7 +141,6 @@
   $flexinode_enabled = module_exist('flexinode');
   
   $output = workspace_addform();
-  
   $node_select = array('n.nid', 'n.uid', 'n.type', '0 AS cid', 'n.title', 'n.status', 'n.changed', 's.comment_count', '1 AS node');
   $node_from = array('{node} n');
   $node_join = array('LEFT JOIN {node_comment_statistics} s ON n.nid = s.nid');
@@ -294,7 +292,7 @@
   $maxfilenames = $user->workspaces ? $user->workspaces['default']['maxfilenames'] : 50;
   $output .= form_textfield(t('Number of files'), 'maxfilenames', $maxfilenames, '4', '5', t('Maximum number of filenames to display in your workspace.'));
   $output .= form_submit(t('Save configuration'));
-  return form($output);
+  return (form($output));
 }
 
 /**
@@ -316,12 +314,11 @@
   $description = t('Choose what kind of content you would like to add.');
   $select = t('Select...');
   $options = array($select => $select);
-  foreach (node_list() as $type) {
+  foreach (node_get_types() as $type) {
     if (node_access('create', $type, $user->uid)) {
       $options[$type] = node_invoke($type, 'node_name');
     }
   }
-
   $section = form_select(t('Add content'), 'content_type', '', $options, $description);
   $submit = form_submit(t('Add new item'));