From 1b98b9c106d46ca626e9f8ac0e7fa09f02dad48d Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 27 Jan 2010 14:10:32 +0000
Subject: [PATCH] Move deprecated admin functions to
 wp-admin/includes/deprecated.php. Props nacin. fixes #12024

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

diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php
index cbc59aae3d..681a2daefa 100644
--- a/wp-admin/includes/deprecated.php
+++ b/wp-admin/includes/deprecated.php
@@ -1,13 +1,41 @@
 <?php
 /**
  * Deprecated admin functions from past WordPress versions. You shouldn't use these
- * globals and functions and look for the alternatives instead. The functions
- * and globals will be removed in a later version.
+ * functions and look for the alternatives instead. The functions will be removed
+ * in a later version.
  *
  * @package WordPress
  * @subpackage Deprecated
  */
 
+/*
+ * Deprecated functions come here to die.
+ */
+
+/**
+ * @since 2.1
+ * @deprecated 2.1
+ * @deprecated Use wp_tiny_mce().
+ * @see wp_tiny_mce()
+ */
+function tinymce_include() {
+	_deprecated_function( __FUNCTION__, '2.1', 'wp_tiny_mce()' );
+
+	wp_tiny_mce();
+}
+
+/**
+ * Unused Admin function.
+ *
+ * @since 2.0
+ * @deprecated 2.5
+ *
+ */
+function documentation_link() {
+	_deprecated_function( __FUNCTION__, '2.5', '' );
+	return;
+}
+
 /**
  * Calculates the new dimentions for a downsampled image.
  *
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index d5bdf3a20c..db15ee53d6 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -775,18 +775,6 @@ function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = '
 	return wp_dropdown_categories($query);
 }
 
-/**
- * @since 2.1
- * @deprecated 2.1
- * @deprecated Use wp_tiny_mce().
- * @see wp_tiny_mce()
- */
-function tinymce_include() {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_tiny_mce()' );
-
-	wp_tiny_mce();
-}
-
 /**
  * @since 1.2
  * @deprecated 2.1
@@ -1312,18 +1300,6 @@ function create_user($username, $password, $email) {
 	return wp_create_user($username, $password, $email);
 }
 
-/**
- * Unused Admin function.
- *
- * @since 2.0
- * @deprecated 2.5
- *
- */
-function documentation_link() {
-	_deprecated_function( __FUNCTION__, '2.5', '' );
-	return;
-}
-
 /**
  * Unused function.
  *