--- og_promote.module?revision=1.1.2.1  2009-12-30 12:53:58.000000000 -0600
+++ og_promote.module   2009-12-30 12:55:32.000000000 -0600
@@ -91,31 +91,8 @@ function og_promote_admin_settings() {
     $form['og_promote_role'] = array('#type' => 'item', '#title' => t('No roles'), '#description' => t('You need to !admin_roles to use this module.', array('!admin_roles' => l(t('define some additional roles'), 'admin/user/roles'))));
   }

-  $options = array();
-  $values = array();
+  $options = og_all_groups_options();

-  $types = variable_get('og_node_types', array('og'));
-
-  foreach ($types as $type) {
-    $result = db_query("SELECT n.nid, n.title, o.* FROM {node} n INNER JOIN {og} o ON n.nid = o.nid WHERE n.type = '%s' ORDER BY n.title", $type);
-    while ($group = db_fetch_object($result)) {
-      $options[$group->nid] = check_plain($group->title);
-      switch ($group->selective) {
-        case OG_OPEN:
-          $options[$group->nid] .= check_plain($row->title) .' '. t('(open group)');
-          break;
-        case OG_MODERATED:
-          $options[$group->nid] .= check_plain($row->title) .' '. t('(moderated group)');
-          break;
-        case OG_INVITE_ONLY:
-          $options[$group->nid] .= check_plain($row->title) .' '. t('(invite only group)');
-          break;
-        case OG_CLOSED:
-          $options[$group->nid] .= check_plain($row->title) .' '. t('(closed group)');
-          break;
-      }
-    }
-  }
   if (count($options)) {
     $map = variable_get('og_promote_map', array());