From acea6cbad8b60cda6d321a97f1bd2f31da5e787e Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Sun, 25 Jun 2017 00:05:44 +0000 Subject: [PATCH] Improve the usefulness of several `_deprecated_function()` calls by passing known replacement functions, methods, or hooks. Props jrf. See #41121. Built from https://develop.svn.wordpress.org/trunk@40929 git-svn-id: http://core.svn.wordpress.org/trunk@40779 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/cache.php | 2 +- wp-includes/class-wp-customize-widgets.php | 8 ++++---- wp-includes/deprecated.php | 8 ++++---- wp-includes/ms-deprecated.php | 6 +++--- wp-includes/version.php | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wp-includes/cache.php b/wp-includes/cache.php index b974756914..eb97cc7193 100644 --- a/wp-includes/cache.php +++ b/wp-includes/cache.php @@ -264,7 +264,7 @@ function wp_cache_add_non_persistent_groups( $groups ) { * @global WP_Object_Cache $wp_object_cache Object cache global instance. */ function wp_cache_reset() { - _deprecated_function( __FUNCTION__, '3.5.0' ); + _deprecated_function( __FUNCTION__, '3.5.0', 'WP_Object_Cache::reset()' ); global $wp_object_cache; diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php index 40590f0818..a180a93008 100644 --- a/wp-includes/class-wp-customize-widgets.php +++ b/wp-includes/class-wp-customize-widgets.php @@ -2055,7 +2055,7 @@ final class WP_Customize_Widgets { * @deprecated 4.2.0 Deprecated in favor of the {@see 'customize_dynamic_setting_args'} filter. */ public function setup_widget_addition_previews() { - _deprecated_function( __METHOD__, '4.2.0' ); + _deprecated_function( __METHOD__, '4.2.0', 'customize_dynamic_setting_args' ); } /** @@ -2067,7 +2067,7 @@ final class WP_Customize_Widgets { * @deprecated 4.2.0 Deprecated in favor of the {@see 'customize_dynamic_setting_args'} filter. */ public function prepreview_added_sidebars_widgets() { - _deprecated_function( __METHOD__, '4.2.0' ); + _deprecated_function( __METHOD__, '4.2.0', 'customize_dynamic_setting_args' ); } /** @@ -2079,7 +2079,7 @@ final class WP_Customize_Widgets { * @deprecated 4.2.0 Deprecated in favor of the {@see 'customize_dynamic_setting_args'} filter. */ public function prepreview_added_widget_instance() { - _deprecated_function( __METHOD__, '4.2.0' ); + _deprecated_function( __METHOD__, '4.2.0', 'customize_dynamic_setting_args' ); } /** @@ -2091,6 +2091,6 @@ final class WP_Customize_Widgets { * @deprecated 4.2.0 Deprecated in favor of the {@see 'customize_dynamic_setting_args'} filter. */ public function remove_prepreview_filters() { - _deprecated_function( __METHOD__, '4.2.0' ); + _deprecated_function( __METHOD__, '4.2.0', 'customize_dynamic_setting_args' ); } } diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index 027194a8cd..e6eddb143e 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -1650,7 +1650,7 @@ function the_author_ID() { * @param int $encode_html Optional. How to encode the content. */ function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) { - _deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed' ); + _deprecated_function( __FUNCTION__, '2.9.0', 'the_content_feed()' ); $content = get_the_content($more_link_text, $stripteaser); $content = apply_filters('the_content_rss', $content); if ( $cut && !$encode_html ) @@ -3814,7 +3814,7 @@ function wp_kses_js_entities( $string ) { * @return int */ function _usort_terms_by_ID( $a, $b ) { - _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' ); + _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort()' ); if ( $a->term_id > $b->term_id ) return 1; @@ -3839,7 +3839,7 @@ function _usort_terms_by_ID( $a, $b ) { * @return int */ function _usort_terms_by_name( $a, $b ) { - _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' ); + _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort()' ); return strcmp( $a->name, $b->name ); } @@ -3860,7 +3860,7 @@ function _usort_terms_by_name( $a, $b ) { function _sort_nav_menu_items( $a, $b ) { global $_menu_item_sort_prop; - _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' ); + _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort()' ); if ( empty( $_menu_item_sort_prop ) ) return 0; diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php index aaee22e72e..5081985043 100644 --- a/wp-includes/ms-deprecated.php +++ b/wp-includes/ms-deprecated.php @@ -24,7 +24,7 @@ * @return WP_Site Current site object. */ function get_dashboard_blog() { - _deprecated_function( __FUNCTION__, '3.1.0' ); + _deprecated_function( __FUNCTION__, '3.1.0', 'get_site()' ); if ( $blog = get_site_option( 'dashboard_blog' ) ) { return get_site( $blog ); } @@ -268,7 +268,7 @@ function get_most_active_blogs( $num = 10, $display = true ) { * @param string $url Optional. Redirect URL. Default empty. */ function wpmu_admin_do_redirect( $url = '' ) { - _deprecated_function( __FUNCTION__, '3.3.0' ); + _deprecated_function( __FUNCTION__, '3.3.0', 'wp_redirect()' ); $ref = ''; if ( isset( $_GET['ref'] ) ) @@ -308,7 +308,7 @@ function wpmu_admin_do_redirect( $url = '' ) { * @return string */ function wpmu_admin_redirect_add_updated_param( $url = '' ) { - _deprecated_function( __FUNCTION__, '3.3.0' ); + _deprecated_function( __FUNCTION__, '3.3.0', 'add_query_arg()' ); if ( strpos( $url, 'updated=true' ) === false ) { if ( strpos( $url, '?' ) === false ) diff --git a/wp-includes/version.php b/wp-includes/version.php index fd981487c3..0ac1198eee 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-alpha-40928'; +$wp_version = '4.9-alpha-40929'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.