- Made sure the selection boxes don't grow too long.  Requisted by kika,
  patch by Marco.

modules/taxonomy.module

@@ -513,8 +513,7 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti
       $select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected=\"selected\"" : "") : ($key == $value ? " selected=\"selected\"" : "")) .">". check_form($choice) ."</option>";
     }
 
-    // min 8, possibly options/3 (set max too?)
-    $size = max(8, round(count($options)) / 3);
+    $size = min(12, count($options));
 
     return form_item($title, "<select name=\"edit[$name][]\"". ($multiple ? " multiple size=\"$size\"" : "") . ($extra ? " $extra" : "") .">$select</select>", $description);
   }

modules/taxonomy/taxonomy.module

@@ -513,8 +513,7 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti
       $select .= "<option value=\"$key\"". (is_array($value) ? (in_array($key, $value) ? " selected=\"selected\"" : "") : ($key == $value ? " selected=\"selected\"" : "")) .">". check_form($choice) ."</option>";
     }
 
-    // min 8, possibly options/3 (set max too?)
-    $size = max(8, round(count($options)) / 3);
+    $size = min(12, count($options));
 
     return form_item($title, "<select name=\"edit[$name][]\"". ($multiple ? " multiple size=\"$size\"" : "") . ($extra ? " $extra" : "") .">$select</select>", $description);
   }