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

Timestamp:

12/30/2009 04:23:39 PM (15 years ago)

Author:

westi

Message:

Updates and improvements to _depreceated_argument. See #11386 props nacin.

File:

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

trunk/wp-includes/functions.php

@@ -571 +571 @@
  */
 function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) {
+    if ( !empty( $deprecated ) )
+        _deprecated_argument( __FUNCTION__, '2.3' );
+
     global $wpdb;
 
@@ -1204 +1207 @@
  */
 function wp_get_http( $url, $file_path = false, $deprecated = false ) {
+    if ( !empty( $deprecated ) )
+        _deprecated_argument( __FUNCTION__, '0.0' );
+
     @set_time_limit( 60 );
 
@@ -1246 +1252 @@
  */
 function wp_get_http_headers( $url, $deprecated = false ) {
+    if ( !empty( $deprecated ) )
+        _deprecated_argument( __FUNCTION__, '0.0' );
+
     $response = wp_remote_head( $url );
 
@@ -2188 +2197 @@
  */
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
+    if ( !empty( $deprecated ) )
+        _deprecated_argument( __FUNCTION__, '0.0' );
+
     if ( empty( $name ) )
         return array( 'error' => __( 'Empty filename' ) );
@@ -3040 +3052 @@
  * <code>
  * if ( !empty($deprecated) )
- *  _deprecated_argument( __FUNCTION__, 'deprecated', '0.0' );
+ *  _deprecated_argument( __FUNCTION__, '0.0' );
  * </code>
  *
@@ -3054 +3066 @@
  * @access private
  *
- * @uses do_action() Calls 'deprecated_argument_run' and passes the function and argument names and what to use instead.
+ * @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.
  *
  * @param string $function The function that was called
- * @param string $argument The name of the deprecated argument that was used
- * @param string $version The version of WordPress that deprecated the function
+ * @param string $version The version of WordPress that deprecated the argument used
  * @param string $message Optional. A message regarding the change.
  */
-function _deprecated_argument($function, $argument, $version, $message = null) {
-
-    do_action('deprecated_argument_run', $function, $argument, $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) )
-            trigger_error( sprintf( __('The %1$s argument of %2$s is <strong>deprecated</strong> since version %3$s! %4$s'), $function, $argument, $version, $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
-            trigger_error( sprintf( __('The %1$s argument of %2$s is <strong>deprecated</strong> since version %3$s with no alternative available.'), $function, $argument, $version ) );
+            trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
     }
 }