Index: fivestar.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/fivestar/fivestar.module,v retrieving revision 1.13.2.63 diff -u -r1.13.2.63 fivestar.module --- fivestar.module 1 Jul 2009 02:17:46 -0000 1.13.2.63 +++ fivestar.module 1 Jul 2009 02:41:26 -0000 @@ -1160,7 +1160,6 @@ $form['content_type'] = array( '#type' => 'hidden', '#value' => $settings['content_type'], - '#id' => $settings['content_id'] ? 'edit-content-type-'. $settings['content_id'] : NULL, ); } @@ -1168,7 +1167,6 @@ $form['content_id'] = array( '#type' => 'hidden', '#value' => $settings['content_id'], - '#id' => $settings['content_id'] ? 'edit-content-id-'. $settings['content_id'] : NULL, ); } @@ -1191,14 +1189,12 @@ $form['destination'] = array( '#type' => 'hidden', '#value' => $_GET['q'], - '#id' => isset($settings['content_id']) ? 'edit-destination-'. $settings['content_id'] : NULL, ); $form['fivestar_submit'] = array( '#type' => 'submit', '#value' => t('Rate'), '#attributes' => array('class' => 'fivestar-submit'), - '#id' => isset($settings['content_id']) ? 'edit-fivestar-submit-'. $settings['content_id'] : NULL, ); $form['vote']['#attributes']['class'] = isset($form['vote']['#attributes']['class']) ? $form['vote']['#attributes']['class'] : ''; @@ -1532,13 +1528,11 @@ * Process callback for fivestar_element -- see fivestar_element() */ function fivestar_expand($element) { - static $fivestar_id = 0; if (isset($element['#vote_count'])) { $element['vote_count'] = array( '#type' => 'hidden', '#value' => $element['#vote_count'], - '#id' => 'edit-vote-count-'. $fivestar_id, ); } @@ -1546,7 +1540,6 @@ $element['vote_average'] = array( '#type' => 'hidden', '#value' => $element['#vote_average'], - '#id' => 'edit-vote-average-'. $fivestar_id, ); } @@ -1555,13 +1548,11 @@ '#type' => 'hidden', '#value' => url($element['#auto_submit_path']), '#attributes' => array('class' => 'fivestar-path'), - '#id' => 'edit-auto-submit-path-'. $fivestar_id, ); $element['auto_submit_token'] = array( '#type' => 'hidden', '#value' => fivestar_get_token($element['#auto_submit_path']), '#attributes' => array('class' => 'fivestar-token'), - '#id' => 'edit-auto-submit-token-'. $fivestar_id, ); } @@ -1600,7 +1591,6 @@ '#required' => $element['#required'], '#default_value' => $default_value, '#parents' => $element['#parents'], - '#id' => 'edit-vote-'. $fivestar_id, '#theme' => 'fivestar_select', '#weight' => $element['#weight'], ); @@ -1613,14 +1603,12 @@ // Set a class for the display of label text on hover. $label_class = $element['#labels_enable'] ? ' fivestar-labels-hover' : ''; - $element['#id'] = 'edit-vote-'. $fivestar_id; $element['#prefix'] = '