Changeset 46792

Timestamp:

11/27/2019 11:53:31 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Plugins: Correct default value of $replacement parameter in do_action_deprecated() and apply_filters_deprecated().

This addresses an inconsistency with _deprecated_hook(), which uses is_null() to check if $replacement was provided, however the previous default value was false.

Props shaampk1, felipeelia.
Fixes #48817.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• plugin.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -4924 +4924 @@
  * @param string $hook        The hook that was used.
  * @param string $version     The version of WordPress that deprecated the hook.
- * @param string $replacement Optional. The hook that should have been used.
- * @param string $message     Optional. A message regarding the change.
+ * @param string $replacement Optional. The hook that should have been used.
+ * @param string $message     Optional. A message regarding the change.
  */
 function _deprecated_hook( $hook, $version, $replacement = null, $message = null ) {

trunk/src/wp-includes/plugin.php

@@ -621 +621 @@
  * @param array  $args        Array of additional function arguments to be passed to apply_filters().
  * @param string $version     The version of WordPress that deprecated the hook.
- * @param string $replacement Optional. The hook that should have been used. Default false.
+ * @param string $replacement Optional. The hook that should have been used. Default .
  * @param string $message     Optional. A message regarding the change. Default null.
  */
-function apply_filters_deprecated( $tag, $args, $version, $replacement = false, $message = null ) {
+function apply_filters_deprecated( $tag, $args, $version, $replacement = , $message = null ) {
     if ( ! has_filter( $tag ) ) {
         return $args[0];
@@ -648 +648 @@
  * @param array  $args        Array of additional function arguments to be passed to do_action().
  * @param string $version     The version of WordPress that deprecated the hook.
- * @param string $replacement Optional. The hook that should have been used.
- * @param string $message     Optional. A message regarding the change.
- */
-function do_action_deprecated( $tag, $args, $version, $replacement = false, $message = null ) {
+ * @param string $replacement Optional. The hook that should have been used.
+ * @param string $message     Optional. A message regarding the change.
+ */
+function do_action_deprecated( $tag, $args, $version, $replacement = , $message = null ) {
     if ( ! has_action( $tag ) ) {
         return;