Index: modules/cvslog/cvs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.module,v
retrieving revision 1.134
diff -u -p -r1.134 cvs.module
--- modules/cvslog/cvs.module	28 Dec 2006 02:06:46 -0000	1.134
+++ modules/cvslog/cvs.module	28 Dec 2006 23:05:43 -0000
@@ -786,10 +786,13 @@ function cvs_alter_project_release_form(
         if (isset($post_val)) {
           if (is_numeric($post_val) && !empty($post_val) && db_result(db_query('SELECT COUNT(*) FROM {term_data} WHERE tid = %d AND vid = %d', $post_val, $vid))) {
             $version->version_api_tid = $post_val;
-            $options[$post_val] = _cvs_get_option_from_taxo($form, $vid, $post_val);
-            $form['taxonomy'][$vid]['#options'] = $options;
-            $form['taxonomy'][$vid]['#default_value'] = $post_val;
-            $needs_api_none = false;
+            $index = form_get_option_key($form['taxonomy'][$vid], $post_val);
+            if ($index !== FALSE) {
+              $options[$post_val] = $form['taxonomy'][$vid]['#options'][$index];
+              $form['taxonomy'][$vid]['#options'] = $options;
+              $form['taxonomy'][$vid]['#default_value'] = $post_val;
+              $needs_api_none = false;
+            }
           }
         }
         if ($needs_api_none) {
@@ -899,9 +902,12 @@ function cvs_alter_project_release_form(
       }
       if (isset($form['taxonomy'][$vid])) {
         $tid = $version->version_api_tid;
-        $options[$tid] = _cvs_get_option_from_taxo($form, $vid, $tid);
-        $form['taxonomy'][$vid]['#options'] = $options;
-        $form['taxonomy'][$vid]['#default_value'] = $tid;
+        $index = form_get_option_key($form['taxonomy'][$vid], $tid);
+        if ($index !== FALSE) {
+          $options[$tid] = $form['taxonomy'][$vid]['#options'][$index];
+          $form['taxonomy'][$vid]['#options'] = $options;
+          $form['taxonomy'][$vid]['#default_value'] = $tid;
+        }
       }
       unset($form['version']['num']['#type']);
       unset($form['version']['num']['#title']);
@@ -1037,19 +1043,6 @@ function _cvs_alter_project_release_form
   $form['#redirect'] = FALSE;
 }
 
-function _cvs_get_option_from_taxo($form, $vid, $tid) {
-  if (!isset($form['taxonomy'][$vid])) {
-    return NULL;
-  }
-  foreach ($form['taxonomy'][$vid]['#options'] as $key => $obj) {
-    if (isset($obj->option[$tid])) {
-      return $obj;
-    }
-  }
-  return NULL;
-}
-
-
 /**
  * pre_render callback for the project_release node form. We use this
  * to set the required form attribute back to TRUE on the body field, 
Index: modules/project/release/project_release.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project/release/project_release.module,v
retrieving revision 1.5
diff -u -p -r1.5 project_release.module
--- modules/project/release/project_release.module	28 Dec 2006 00:45:29 -0000	1.5
+++ modules/project/release/project_release.module	28 Dec 2006 23:05:44 -0000
@@ -1094,9 +1094,10 @@ function project_release_alter_release_f
         elseif ($tids = variable_get('project_release_active_compatibility_tids', '')) {
           // We don't have the term since we're adding a new release.
           // Restrict to the active terms (if any).
-          foreach ($form['taxonomy'][$vid]['#options'] as $tid => $name) {
-             if ($tid && $tids[$tid]) {
-              $options[$tid] = check_plain($name);
+          foreach ($tids as $tid) {
+            $index = form_get_option_key($form['taxonomy'][$vid], $tid);
+            if ($index !== FALSE) {
+              $options[$tid] = $form['taxonomy'][$vid]['#options'][$index];
             }
           }
           if (!empty($options)) {