Ticket #5240: taxonomy_diffs

--- taxonomy_o.php      2007-09-23 00:36:00.000000000 +0200
+++ taxonomy.php        2007-10-21 11:50:28.000000000 +0200
@@ -926,6 +926,7 @@
                $slug = sanitize_title($name);
-
+       
        $term_group = 0;
        if ( $alias_of ) {
-               $alias = $wpdb->fetch_row("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = '$alias_of'");
+               /*fetch_row*/
+               $alias = $wpdb->get_row("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = '$alias_of'");
                if ( $alias->term_group ) {
@@ -933,6 +934,10 @@
                        $term_group = $alias->term_group;
+                       
                } else {
-                       // The alias isn't in a group, so let's create a new one and firstly add the alias term to it.
-                       $term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
+                       //echo $alias_of.' o-oo '.$alias->term_group;
+                       //  GROUP BY term_group The alias isn't in a group, so let's create a new one and firstly add the alias term to it.
+                       $term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms") + 1;
+                       
                        $wpdb->query("UPDATE $wpdb->terms SET term_group = $term_group WHERE term_id = $alias->term_id");
+               
                }
@@ -1093,4 +1098,6 @@
        if ( $alias_of ) {
-               $alias = $wpdb->fetch_row("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = '$alias_of'");
+               /*get_row*/
+               $alias = $wpdb->get_row("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = '$alias_of'");
                if ( $alias->term_group ) {
+                       
                        // The alias we want is already in a group, so let's use that one.
@@ -1098,4 +1105,5 @@
                } else {
-                       // The alias isn't in a group, so let's create a new one and firstly add the alias term to it.
-                       $term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
+                       
+                       // GROUP BY term_group - The alias isn't in a group, so let's create a new one and firstly add the alias term to it.
+                       $term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms") + 1;
                        $wpdb->query("UPDATE $wpdb->terms SET term_group = $term_group WHERE term_id = $alias->term_id");