Index: avatar_selection.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/avatar_selection/avatar_selection.module,v
retrieving revision 1.1.2.20.2.18
diff -u -p -r1.1.2.20.2.18 avatar_selection.module
--- avatar_selection.module 28 Apr 2008 20:49:08 -0000 1.1.2.20.2.18
+++ avatar_selection.module 9 May 2008 11:25:12 -0000
@@ -195,11 +195,13 @@ function avatar_selection_form_alter($fo
     $selects = _avatar_selection_image_list($anon_user);
     if (count($selects['avatars'])) {
       drupal_add_css(drupal_get_path('module', 'avatar_selection') .'/avatar_selection.css');
-      $form['picture'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Picture'),
-        '#weight' => 1,
-      );
+      if (!is_array($form['picture'])) {
+        $form['picture'] = array(
+          '#type' => 'fieldset',
+          '#title' => t('Picture'),
+          '#weight' => 1,
+        );
+      }
       $form['picture']['select_avatar'] = array(
         '#type' => 'radios',
         '#title' => t('Select an avatar'),
@@ -607,7 +609,7 @@ function avatar_selection_roles_page($op
       $total_count = $avatar->count;
     }
     $output .= '<p>'. t('There is a total of %count avatars configured.', array('%count' => $total_count)) .'</p>';
-
+

     // Get the count of avatars per role and organic group.
     $result = db_query("SELECT avs.access, avs.og_access, count(*) AS count FROM {avatar_selection} avs GROUP BY avs.access, avs.og_access");
@@ -725,7 +727,7 @@ function avatar_selection_edit_form($for
           '#value' => '<strong>'. t('Organic Group: %name', array('%name' => $set_name)) .'</strong>'
         );
       }
-
+
       $images_per_page = variable_get('avatar_selection_avatar_per_page', 30);
       $form['select_avatar'] = array(
         '#type' => 'radios',