Changeset 12537

Timestamp:

12/24/2009 11:12:04 AM (17 years ago)

Author:

westi

Message:

Fix typo in _deprecated_argument() and start using _deprecated_argument() in wp-includes files. See #11386 props nacin.

Location:

trunk/wp-includes

Files:

• author-template.php (modified) (2 diffs)
• comment-template.php (modified) (1 diff)
• comment.php (modified) (1 diff)
• cron.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• post-template.php (modified) (1 diff)
• widgets.php (modified) (1 diff)

trunk/wp-includes/author-template.php

@@ -42 +42 @@
  *
  * @param string $deprecated Deprecated.
- * @param string $deprecated_echo Echo the string or return it.
+ * @param string $deprecated_echo Deprecated. Use get_the_author(). Echo the string or return it.
  * @return string The author's display name, from get_the_author().
  */
 function the_author($deprecated = '', $deprecated_echo = true) {
+        if ( !empty($deprecated) )
+                _deprecated_argument(__FUNCTION__, 'deprecated', '1.5');
+        if ( $deprecated_echo !== true )
+                _deprecated_argument(__FUNCTION__, 'deprecated_echo', '1.5', __('Use get_the_author() instead if you do not want the value echoed.'));
         if ( $deprecated_echo )
                 echo get_the_author();
@@ -178 +182 @@
  */
 function the_author_posts_link($deprecated = '') {
+        if ( !empty( $deprecated ) )
+                _deprecated_argument(__FUNCTION__, 'deprecated', '0.0');
+
         global $authordata;
         $link = sprintf(

trunk/wp-includes/comment-template.php

@@ -504 +504 @@
  * @since 0.71
  *
- * @param string $deprecated Not Used
- * @param bool $deprecated Not Used
- */
-function comments_link( $deprecated = '', $deprecated = '' ) {
+ * @param string $deprecated_1 Not Used
+ * @param bool $deprecated_2 Not Used
+ */
+function comments_link( $deprecated_1 = '', $deprecated_2 = '' ) {
+        if ( !empty( $deprecated_1 ) )
+                _deprecated_argument(__FUNCTION__, 'deprecated_1', '0.0');
+        if ( !empty( $deprecated_2 ) )
+                _deprecated_argument(__FUNCTION__, 'deprecated_2', '0.0');
+
         echo get_comments_link();
 }

trunk/wp-includes/comment.php

@@ -1512 +1512 @@
  * @return bool|string False on failure, string containing URI on success.
  */
-function discover_pingback_server_uri($url, $deprecated = 2048) {
+function discover_pingback_server_uri($url, $deprecated = '') {
+        if ( !empty($deprecated) )
+                _deprecated_argument(__FUNCTION__, 'deprecated', '0.0');
 
         $pingback_str_dquote = 'rel="pingback"';

trunk/wp-includes/cron.php

@@ -136 +136 @@
         // Backward compatibility
         // Previously this function took the arguments as discrete vars rather than an array like the rest of the API
-        if ( !is_array($args) )
+        if ( !is_array($args) ) {
+                _deprecated_argument(__FUNCTION__, 'args', '3.0.0', __('This argument has changed to an array so as to match with the behaviour of all the other cron functions.') );
                 $args = array_slice( func_get_args(), 1 );
+        }
 
         while ( $timestamp = wp_next_scheduled( $hook, $args ) )

trunk/wp-includes/functions.php

@@ -3046 +3046 @@
         // Allow plugin to filter the output error trigger
         if( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
-                if( !is_null($replacement) )
+                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 ) );
                 else

trunk/wp-includes/post-template.php

@@ -247 +247 @@
  */
 function get_the_excerpt($deprecated = '') {
+        if ( !empty( $deprecated ) )
+                _deprecated_argument(__FUNCTION__, 'deprecated', '2.3');
+
         global $post;
         $output = $post->post_excerpt;

trunk/wp-includes/widgets.php

@@ -981 +981 @@
  * @access private
  *
- * @param bool $update Optional, deprecated.
+ * @param bool $deprecated. Not used.
  * @return array Upgraded list of widgets to version 3 array format when called from the admin.
  */
 function wp_get_sidebars_widgets($deprecated = true) {
+        if ( $deprecated !== true )
+                _deprecated_argument(__FUNCTION__, 'deprecated', '0.0');
+
         global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets;