--- og_content_type_admin.module.orig	2007-12-17 21:53:00.000000000 +0100
+++ og_content_type_admin.module	2008-06-30 14:01:44.000000000 +0200
@@ -349,9 +349,6 @@ function og_content_type_admin_admin($gi
       }
     }
   }
-  $og_node_types = variable_get('og_node_types', array('og'));
-  $og_omitted = variable_get('og_omitted', array());//the types in this list supercede this module - no groups can use them at all
-  $exempt = array_merge($og_node_types, $og_omitted);
 
   $form['groups'] = array('#tree' => TRUE);
   while ($result = db_fetch_object($results)) { //grab a group that we're monitoring
@@ -364,7 +361,7 @@ function og_content_type_admin_admin($gi
       $assigned_status = unserialize($result->types_allowed);
       $required_status = unserialize($result->types_active);
       foreach ($node_types_types as $type) {
-        if (!in_array($type->type, $exempt)) {
+        if (!og_is_omitted_type($type->type) && !og_is_group_type($type->type)) {
           $form['groups'][$result->name][$type->type]['name'] = array('#value' => t($type->name));
           $form['groups'][$result->name][$type->type]['name2'] = array(
             '#type' => 'value',
@@ -1198,9 +1195,6 @@ function _og_content_type_admin_rebuild_
   }
   $sql = "SELECT octa.gid, octa.name, octa.types_allowed, octa.types_active FROM {og_content_type_admin} octa ORDER BY octa.name ASC";
   $results = db_query($sql);
-  $og_node_types = variable_get('og_node_types', array('og'));
-  $og_omitted = variable_get('og_omitted', array());
-  $exempt = array_merge($og_node_types, $og_omitted); //get items not allowed
   $bad_query = FALSE;
   while ($result = db_fetch_object($results)) {
     $old_allowed = unserialize($result->types_allowed);
@@ -1230,7 +1224,7 @@ function _og_content_type_admin_rebuild_
     }
     else { //honor group type exemptions from group settings in admin
       foreach ($node_types as $type) {
-        if (!in_array($type->type, $exempt)) {
+        if (!og_is_omitted_type($type->type) && !og_is_group_type($type->type)) {
           if (!empty($info->old_type) && ($type->type == $info->old_type)) {//if the name of the type is changing
             $ntype = $info->type;
             $otype = $info->old_type;
@@ -1268,4 +1262,4 @@ function _og_content_type_admin_rebuild_
   else {
     drupal_set_message('There was a problem updating the og_content_type_admin table', 'error');
   }
-} // function _og_content_type_admin_rebuild_table()
\ Pas de fin de ligne à la fin du fichier.
+} // function _og_content_type_admin_rebuild_table()