sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@46792 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-11-27 23:53:31 +00:00
parent 2dc58b9118
commit 81581b537a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/functions.php
View File

@ -4923,8 +4923,8 @@ function _deprecated_argument( $function, $version, $message = null ) {
*
* @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. Default null.
* @param string $message Optional. A message regarding the change. Default null.
*/
function _deprecated_hook( $hook, $version, $replacement = null, $message = null ) {
/**

10
src/wp-includes/plugin.php
View File

@ -620,10 +620,10 @@ function remove_all_actions( $tag, $priority = false ) {
* @param string $tag The name of the filter hook.
* @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 null.
* @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 = null, $message = null ) {
if ( ! has_filter( $tag ) ) {
return $args[0];
}
@ -647,10 +647,10 @@ function apply_filters_deprecated( $tag, $args, $version, $replacement = false,
* @param string $tag The name of the action hook.
* @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.
* @param string $replacement Optional. The hook that should have been used. Default null.
* @param string $message Optional. A message regarding the change. Default null.
*/
function do_action_deprecated( $tag, $args, $version, $replacement = false, $message = null ) {
function do_action_deprecated( $tag, $args, $version, $replacement = null, $message = null ) {
if ( ! has_action( $tag ) ) {
return;
}