? 184524.patch
? filter_administration_2_.patch
? new_taxonomy_1.diff
? taxonomy_get_synomyms_better.patch
? taxonomy_get_tree_indexed_by_tid.d7.patch
? taxonomy_page_increment.patch
? up_terms_per_page.patch
? sites/default/files
? sites/default/settings.php
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.29
diff -u -p -r1.29 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	19 Sep 2008 20:25:03 -0000	1.29
+++ modules/taxonomy/taxonomy.admin.inc	21 Sep 2008 22:43:35 -0000
@@ -251,7 +251,7 @@ function taxonomy_overview_terms(&$form_
   );
 
   $page            = isset($_GET['page']) ? $_GET['page'] : 0;
-  $page_increment  = 10;  // Number of terms per page.
+  $page_increment  = variable_get('taxonomy_per_page_admin', 100);  // Number of terms per page.
   $page_entries    = 0;   // Elements shown on this page.
   $before_entries  = 0;   // Elements at the root level before this page.
   $after_entries   = 0;   // Elements at the root level after this page.
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.427
diff -u -p -r1.427 taxonomy.module
--- modules/taxonomy/taxonomy.module	19 Sep 2008 20:25:03 -0000	1.427
+++ modules/taxonomy/taxonomy.module	21 Sep 2008 22:43:36 -0000
@@ -892,10 +892,30 @@ function taxonomy_get_synonyms($tid) {
 }
 
 /**
- * Return the term object that has the given string as a synonym.
+ * Return term objects that have the given string as a synonym.
+ *
+ * @param $synonym
+ *   Name of the synonym to search for.
+ *
+ * @param $vid
+ *   (optional) The vocabulary's ID
+ *   If set, returns only terms from within that vocabulary.
+ *
+ * @return array
+ *   An array of terms matched by the given synonym.
+ *
  */
-function taxonomy_get_synonym_root($synonym) {
-  return db_fetch_object(db_query("SELECT * FROM {term_synonym} s, {term_data} t WHERE t.tid = s.tid AND s.name = '%s'", $synonym));
+function taxonomy_get_synonym_root($synonym, $vid = NULL) {
+  if (is_numeric($vid)) {
+    $result = db_query("SELECT * FROM {term_synonym} s, {term_data} t WHERE t.tid = s.tid AND s.name = :synonym AND t.vid = :vid", array(':synonym' => $synonym, ':vid', $vid));
+  }
+  else {
+    $result = db_query("SELECT * FROM {term_synonym} s, {term_data} t WHERE t.tid = s.tid AND s.name = :synonym", array(':synonym' =>$synonym));
+  }
+  foreach ($result AS $term) {
+    $terms[] = $term;
+  }
+  return $terms;
 }
 
 /**