From 95b27d05ce63e9a7594aa908755965644796f2b0 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 13 Feb 2010 07:42:02 +0000
Subject: [PATCH] Deprecate old category admin template functions. Deprecate
 dropdown_categories(), dropdown_link_categories(), wp_dropdown_cats() in
 favor of wp_category_checklist, wp_link_category_checklist,
 wp_dropdown_categories. See #11388

git-svn-id: http://svn.automattic.com/wordpress/trunk@13097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/deprecated.php | 71 ++++++++++++++++++++++++++++++++
 wp-admin/includes/template.php   | 64 ----------------------------
 2 files changed, 71 insertions(+), 64 deletions(-)

diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php
index 681a2daefa..7993b0c632 100644
--- a/wp-admin/includes/deprecated.php
+++ b/wp-admin/includes/deprecated.php
@@ -54,4 +54,75 @@ function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
 	return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ * @deprecated unknown
+ * @deprecated Use wp_category_checklist()
+ * @see wp_category_checklist()
+ *
+ * @param unknown_type $default
+ * @param unknown_type $parent
+ * @param unknown_type $popular_ids
+ */
+function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() ) {
+	_deprecated_function( __FUNCTION__, '0.0', 'wp_category_checklist()' );
+	global $post_ID;
+	wp_category_checklist( $post_ID );
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ * @deprecated unknown
+ * @deprecated Use wp_link_category_checklist()
+ * @see wp_link_category_checklist()
+ *
+ * @param unknown_type $default
+ */
+function dropdown_link_categories( $default = 0 ) {
+	_deprecated_function( __FUNCTION__, '0.0', 'wp_link_category_checklist()' );
+	global $link_id;
+	wp_link_category_checklist( $link_id );
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ * @deprecated 3.0.0
+ * @deprecated Use wp_dropdown_categories()
+ * @see wp_dropdown_categories()
+ *
+ * @param unknown_type $currentcat
+ * @param unknown_type $currentparent
+ * @param unknown_type $parent
+ * @param unknown_type $level
+ * @param unknown_type $categories
+ * @return unknown
+ */
+function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
+	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );
+	if (!$categories )
+		$categories = get_categories( array('hide_empty' => 0) );
+
+	if ( $categories ) {
+		foreach ( $categories as $category ) {
+			if ( $currentcat != $category->term_id && $parent == $category->parent) {
+				$pad = str_repeat( '&#8211; ', $level );
+				$category->name = esc_html( $category->name );
+				echo "\n\t<option value='$category->term_id'";
+				if ( $currentparent == $category->term_id )
+					echo " selected='selected'";
+				echo ">$pad$category->name</option>";
+				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
+			}
+		}
+	} else {
+		return false;
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index fa9668c9da..2b8a264f0f 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -230,22 +230,6 @@ function __checked_selected_helper( $helper, $current, $echo, $type) {
 // Category Checklists
 //
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- * @deprecated Use {@link wp_link_category_checklist()}
- * @see wp_link_category_checklist()
- *
- * @param unknown_type $default
- * @param unknown_type $parent
- * @param unknown_type $popular_ids
- */
-function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() ) {
-	global $post_ID;
-	wp_category_checklist($post_ID);
-}
-
 /**
  * {@internal Missing Short Description}}
  *
@@ -420,21 +404,6 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech
 	return $popular_ids;
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- * @deprecated Use {@link wp_link_category_checklist()}
- * @see wp_link_category_checklist()
- *
- * @param unknown_type $default
- */
-function dropdown_link_categories( $default = 0 ) {
-	global $link_id;
-
-	wp_link_category_checklist($link_id);
-}
-
 /**
  * {@internal Missing Short Description}}
  *
@@ -2342,39 +2311,6 @@ function wp_comment_trashnotice() {
 <?php
 }
 
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $currentcat
- * @param unknown_type $currentparent
- * @param unknown_type $parent
- * @param unknown_type $level
- * @param unknown_type $categories
- * @return unknown
- */
-function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
-
-	if ( $categories ) {
-		foreach ( $categories as $category ) {
-			if ( $currentcat != $category->term_id && $parent == $category->parent) {
-				$pad = str_repeat( '&#8211; ', $level );
-				$category->name = esc_html( $category->name );
-				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
-					echo " selected='selected'";
-				echo ">$pad$category->name</option>";
-				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
-			}
-		}
-	} else {
-		return false;
-	}
-}
-
 /**
  * {@internal Missing Short Description}}
  *