Index: poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.263.2.4
diff -u -r1.263.2.4 poll.module
--- modules/poll/poll.module	14 Sep 2009 10:16:54 -0000	1.263.2.4
+++ modules/poll/poll.module	22 Mar 2010 18:44:05 -0000
@@ -309,16 +309,18 @@
     '#parents' => array('choice', $delta, 'chtext'),
   );
 
-  if ($admin) {
+//  if ($admin) {
     $form['chvotes'] = array(
       '#type' => 'textfield',
       '#title' => t('Votes for choice @n', array('@n' => ($delta + 1))),
+      '#value' => ($admin ? NULL : $votes),
       '#default_value' => $votes,
+      '#disabled' => !$admin,
       '#size' => 5,
       '#maxlength' => 7,
       '#parents' => array('choice', $delta, 'chvotes'),
     );
-  }
+//  }
 
   return $form;
 }