Changeset 13754

Timestamp:

03/18/2010 08:17:15 PM (15 years ago)

Author:

nacin

Message:

Account for old type=link (now taxonomy=link_category) in wp_dropdown_categories(). Don't use the deprecated argument in options-writing. Sprinkle in some deprecated warnings. fixes #12630

Location:

trunk

Files:

• wp-admin/options-writing.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (2 diffs)
• wp-includes/category.php (modified) (1 diff)

trunk/wp-admin/options-writing.php

@@ -53 +53 @@
 <td>
 <?php
-wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category', 'orderby' => 'name', 'selected' => get_option('default_link_category'), 'hierarchical' => true, 'type' => 'link'));
+wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category', 'orderby' => 'name', 'selected' => get_option('default_link_category'), 'hierarchical' => true, 'taxonomy' => 'link_category'));
 ?>
 </td>

trunk/wp-includes/category-template.php

@@ -319 +319 @@
  *     'class' (string) - The class attribute value for select element.
  *     'selected' (int) - Which category ID is selected.
+ *     'taxonomy' (string) - The name of the taxonomy to retrieve. Defaults to category.
  *
  * The 'hierarchical' argument, which is disabled by default, will override the
@@ -345 +346 @@
 
     $defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
+
+    // Back compat.
+    if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
+        _deprecated_argument( __FUNCTION__, '3.0', '' );
+        $args['taxonomy'] = 'link_category';
+    }
 
     $r = wp_parse_args( $args, $defaults );

trunk/wp-includes/category.php

@@ -43 +43 @@
     $taxonomy = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );
 
-    if ( isset($args['type']) && 'link' == $args['type'] ) //Back compat
+    // Back compat
+    if ( isset($args['type']) && 'link' == $args['type'] ) {
+        _deprecated_argument( __FUNCTION__, '3.0', '' );
         $taxonomy = $args['taxonomy'] = 'link_category';
+    }
 
     $categories = (array) get_terms( $taxonomy, $args );