Ticket #12024: 12024.diff

wp-admin/includes/deprecated.php

@@ -1 +1 @@
 <?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.
  *
  * @since 2.0.0

wp-includes/deprecated.php

@@ -776 +776 @@
 }
 
 /**
- * @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
  * @deprecated Use wp_list_authors()
@@ -1313 +1301 @@
 }
 
 /**
- * Unused Admin function.
- *
- * @since 2.0
- * @deprecated 2.5
- *
- */
-function documentation_link() {
-        _deprecated_function( __FUNCTION__, '2.5', '' );
-        return;
-}
-
-/**
  * Unused function.
  *
  * @deprecated 2.5