Changeset 12680 for trunk/wp-includes/functions.php

Timestamp:

01/09/2010 10:03:55 AM (16 years ago)

Author:

westi

Message:

Add missing version numbers to _deprecated_argument() calls.
Remove deprecated argument from xfn_check() calls.
Pass version number to deprecated_file_included, deprecated_function_run and deprecated_argument_run actions.
Fixes #11386 props nacin.

File:

• trunk/wp-includes/functions.php (modified) (11 diffs)

trunk/wp-includes/functions.php

@@ -1171 +1171 @@
 function wp_get_http( $url, $file_path = false, $deprecated = false ) {
     if ( !empty( $deprecated ) )
-        _deprecated_argument( __FUNCTION__, '0.0' );
+        _deprecated_argument( __FUNCTION__, '2.7' );
 
     @set_time_limit( 60 );
@@ -1216 +1216 @@
 function wp_get_http_headers( $url, $deprecated = false ) {
     if ( !empty( $deprecated ) )
-        _deprecated_argument( __FUNCTION__, '0.0' );
+        _deprecated_argument( __FUNCTION__, '2.7' );
 
     $response = wp_remote_head( $url );
@@ -2154 +2154 @@
  *
  * @param string $name
- * @param null $deprecated Not used. Set to null.
+ * @param null $deprecated Never used. Set to null.
  * @param mixed $bits File content
  * @param string $time Optional. Time formatted in 'yyyy/mm'.
@@ -2161 +2161 @@
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
     if ( !empty( $deprecated ) )
-        _deprecated_argument( __FUNCTION__, '0.0' );
+        _deprecated_argument( __FUNCTION__, '2.0' );
 
     if ( empty( $name ) )
@@ -2962 +2962 @@
  *
  * @package WordPress
- * @package Debug
+ * @subpackage Debug
  * @since 2.5.0
  * @access private
  *
- * @uses do_action() Calls 'deprecated_function_run' and passes the function name and what to use instead.
- * @uses apply_filters() Calls 'deprecated_function_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
+ * @uses do_action() Calls 'deprecated_function_run' and passes the function name, what to use instead,
+ *   and the version the function was deprecated in.
+ * @uses apply_filters() Calls 'deprecated_function_trigger_error' and expects boolean value of true to do
+ *   trigger or false to not trigger error.
  *
  * @param string $function The function that was called
@@ -2973 +2975 @@
  * @param string $replacement Optional. The function that should have been called
  */
-function _deprecated_function($function, $version, $replacement=null) {
-
-    do_action('deprecated_function_run', $function, $replacement);
+function _deprecated_function( $function, $version, $replacement=null ) {
+
+    do_action( 'deprecated_function_run', $function, $replacement, $version );
 
     // Allow plugin to filter the output error trigger
-    if( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true )) {
-        if( !is_null($replacement) )
+    if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
+        if ( ! is_null($replacement) )
             trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
         else
@@ -2998 +3000 @@
  *
  * @package WordPress
- * @package Debug
+ * @subpackage Debug
  * @since 2.5.0
  * @access private
  *
- * @uses do_action() Calls 'deprecated_file_included' and passes the file name and what to use instead.
- * @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
+ * @uses do_action() Calls 'deprecated_file_included' and passes the file name, what to use instead,
+ *   and the version in which the file was deprecated.
+ * @uses apply_filters() Calls 'deprecated_file_trigger_error' and expects boolean value of true to do
+ *   trigger or false to not trigger error.
  *
  * @param string $file The file that was included
@@ -3009 +3013 @@
  * @param string $replacement Optional. The file that should have been included based on ABSPATH
  */
-function _deprecated_file($file, $version, $replacement=null) {
-
-    do_action('deprecated_file_included', $file, $replacement);
+function _deprecated_file( $file, $version, $replacement = null ) {
+
+    do_action( 'deprecated_file_included', $file, $replacement, $version );
 
     // Allow plugin to filter the output error trigger
-    if( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
-        if( !is_null($replacement) )
+    if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
+        if ( ! is_null( $replacement ) )
             trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) );
         else
@@ -3030 +3034 @@
  * <code>
  * if ( !empty($deprecated) )
- *  _deprecated_argument( __FUNCTION__, '0.0' );
+ *  _deprecated_argument( __FUNCTION__, '3.0' );
  * </code>
  *
@@ -3040 +3044 @@
  *
  * @package WordPress
- * @package Debug
+ * @subpackage Debug
  * @since 3.0.0
  * @access private
  *
- * @uses do_action() Calls 'deprecated_argument_run' and passes the function name and what to use instead.
- * @uses apply_filters() Calls 'deprecated_argument_trigger_error' and expects boolean value of true to do trigger or false to not trigger error.
+ * @uses do_action() Calls 'deprecated_argument_run' and passes the function name, a message on the change,
+ *   and the version in which the argument was deprecated.
+ * @uses apply_filters() Calls 'deprecated_argument_trigger_error' and expects boolean value of true to do
+ *   trigger or false to not trigger error.
  *
  * @param string $function The function that was called
@@ -3051 +3057 @@
  * @param string $message Optional. A message regarding the change.
  */
-function _deprecated_argument($function, $version, $message = null) {
-
-    do_action('deprecated_argument_run', $function, $message);
+function _deprecated_argument( $function, $version, $message = null ) {
+
+    do_action( 'deprecated_argument_run', $function, $message );
 
     // Allow plugin to filter the output error trigger
-    if( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
-        if( !is_null($message) )
+    if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
+        if ( ! is_null( $message ) )
             trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
         else