From c99326d6e01669a18d3d4dd79c04b76c80717bcc Mon Sep 17 00:00:00 2001
Date: Thu, 22 Jun 2017 00:40:52 +0200
Subject: [PATCH] Add missing replacement functions to various
 `_deprecated_function()` calls

* Add missing parentheses to deprecated function replacement function to be consistent with other deprecated function alternatives.
* Add missing alternative for the WP_Customize Widget deprecated methods.
* Add missing alternative for three deprecated ms functions
* Add missing alternative for deprecated `wp_cache_reset()` function
---
 src/wp-includes/cache.php                      | 2 +-
 src/wp-includes/class-wp-customize-widgets.php | 8 ++++----
 src/wp-includes/deprecated.php                 | 8 ++++----
 src/wp-includes/ms-deprecated.php              | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/wp-includes/cache.php b/src/wp-includes/cache.php
index b974756..eb97cc7 100644
--- a/src/wp-includes/cache.php
+++ b/src/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/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
index 40590f0..4f14a83 100644
--- a/src/wp-includes/class-wp-customize-widgets.php
+++ b/src/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', 'the \'customize_dynamic_setting_args\' filter' );
 	}
 
 	/**
@@ -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', 'the \'customize_dynamic_setting_args\' filter' );
 	}
 
 	/**
@@ -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', 'the \'customize_dynamic_setting_args\' filter' );
 	}
 
 	/**
@@ -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', 'the \'customize_dynamic_setting_args\' filter' );
 	}
 }
diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php
index 027194a..e6eddb1 100644
--- a/src/wp-includes/deprecated.php
+++ b/src/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/src/wp-includes/ms-deprecated.php b/src/wp-includes/ms-deprecated.php
index 3d06dab..7333b9d 100644
--- a/src/wp-includes/ms-deprecated.php
+++ b/src/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 )
-- 
2.10.1.windows.1