Index: sites/default/modules/contrib/workspace/workspace.module
===================================================================
--- sites/default/modules/contrib/workspace/workspace.module	(date 1359411411000)
+++ sites/default/modules/contrib/workspace/workspace.module	(revision )
@@ -153,6 +153,13 @@
     '#default_value' => $account->workspaces ? $account->workspaces['default']['maxfilenames'] : 50,
     '#size' => 4
   );
+  $form['maxcomments'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Number of comments'),
+    '#description' => t('Maximum number of comments to display in your workspace.'),
+    '#default_value' => $account->workspaces['default']['maxcomments'] ? $account->workspaces['default']['maxcomments'] : 50,
+    '#size' => 4
+  );
   $form['uid'] = array(
     '#type' => 'value',
     '#value' => $account->uid,
@@ -176,7 +183,10 @@
   if (!is_numeric($form_state['values']['maxfilenames']) && !form_get_errors()) {
     form_set_error('maxfilenames', t('Please enter a numeric value.'));
   }
+  if (!is_numeric($form_state['values']['maxcomments']) && !form_get_errors()) {
+    form_set_error('maxcomments', t('Please enter a numeric value.'));
-}
+  }
+}
 
 /**
  * Submit handler for per-user configuration form.
@@ -191,6 +201,7 @@
   }
   $account->workspaces['default']['maxnodes'] = (int)$form_state['values']['maxnodes'];
   $account->workspaces['default']['maxfilenames'] = (int)$form_state['values']['maxfilenames'];
+  $account->workspaces['default']['maxcomments'] = (int)$form_state['values']['maxcomments'];
   user_save($account, array('workspaces' => $account->workspaces));
   drupal_set_message(t('The workspace preferences have been saved.'));
   $form_state['redirect'] = 'workspace/'. $form_state['values']['uid'];
@@ -257,7 +268,7 @@
  */
 function workspace_list_comments($account) {
   drupal_set_title(t('Workspace: @name', array('@name' => $account->name)));
-  $max = isset($account->workspaces) ? $account->workspaces['default']['maxcomments'] : 50;
+  $max = isset($account->workspaces['default']['maxcomments']) ? $account->workspaces['default']['maxcomments'] : 50;
 
   $sql =       'SELECT c.nid, c.uid, c.cid, c.subject, c.status, c.timestamp, c.pid, 0 
                 FROM {comments} c 
@@ -370,7 +381,7 @@
  */
 function workspace_list_files($account) {
   drupal_set_title(t('Workspace: @name', array('@name' => $account->name)));
-  $max = isset($user->workspaces) ? $user->workspaces['default']['maxfilenames'] : 50;
+  $max = isset($account->workspaces) ? $account->workspaces['default']['maxfilenames'] : 50;
   $download = t('download');
   $rows = array();
   $header = array(
@@ -486,7 +497,7 @@
   }
 
   foreach (node_get_types() as $type => $object) {
-    if (node_access('create', $type, $user->uid)) {
+    if (node_access('create', $type)) {
       $options[$type] = $object->name;
     }
     if (isset($options[$node_type])) {