<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[48327] trunk/src/wp-includes: Plugins: Consistently use an empty string as the default value for `$replacement` and `$message` parameters in:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48327">48327</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48327","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-05 21:07:48 +0000 (Sun, 05 Jul 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugins: Consistently use an empty string as the default value for `$replacement` and `$message` parameters in:
* `_deprecated_function()`
* `_deprecated_constructor()`
* `_deprecated_file()`
* `_deprecated_argument()`
* `_deprecated_hook()`
* `apply_filters_deprecated()`
* `do_action_deprecated()`
This matches the documented type of `string` for these parameters and removes unnecessarily strict `! is_null()` checks.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/46792">[46792]</a>.
Props jignesh.nakrani, renathoc, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/49698">#49698</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludespluginphp">trunk/src/wp-includes/plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-07-05 20:30:18 UTC (rev 48326)
+++ trunk/src/wp-includes/functions.php 2020-07-05 21:07:48 UTC (rev 48327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4700,9 +4700,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $function The function that was called.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the function.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $replacement Optional. The function that should have been called. Default null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $replacement Optional. The function that should have been called. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _deprecated_function( $function, $version, $replacement = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _deprecated_function( $function, $version, $replacement = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when a deprecated function is called.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4724,7 +4724,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $replacement ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $replacement ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4747,7 +4747,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $replacement ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $replacement ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4816,7 +4816,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_constructor_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $parent_class ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent_class ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP class name, 2: PHP parent class name, 3: Version number, 4: __construct() method. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4841,7 +4841,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $parent_class ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent_class ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4886,10 +4886,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $file The file that was included.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the file.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $replacement Optional. The file that should have been included based on ABSPATH.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $message Optional. A message regarding the change. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _deprecated_file( $file, $version, $replacement = null, $message = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _deprecated_file( $file, $version, $replacement = '', $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when a deprecated file is called.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4914,7 +4914,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = empty( $message ) ? '' : ' ' . $message;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $replacement ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $replacement ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP file name, 2: Version number, 3: Alternative file name. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4937,7 +4937,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $replacement ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $replacement ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4984,9 +4984,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $function The function that was called.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the argument used.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $message Optional. A message regarding the change. Default null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $message Optional. A message regarding the change. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _deprecated_argument( $function, $version, $message = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _deprecated_argument( $function, $version, $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when a deprecated argument is called.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5008,7 +5008,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $message ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: PHP function name, 2: Version number, 3: Optional message regarding the change. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5031,7 +5031,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $message ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $message ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5072,10 +5072,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook The hook that was used.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the hook.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $replacement Optional. The hook that should have been used. Default null.
- * @param string $message Optional. A message regarding the change. Default null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $replacement Optional. The hook that should have been used. Default empty.
+ * @param string $message Optional. A message regarding the change. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _deprecated_hook( $hook, $version, $replacement = null, $message = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _deprecated_hook( $hook, $version, $replacement = '', $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when a deprecated hook is called.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5099,7 +5099,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = empty( $message ) ? '' : ' ' . $message;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $replacement ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $replacement ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: WordPress hook name, 2: Version number, 3: Alternative hook name. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5166,9 +5166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true, $function, $message, $version ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_null( $version ) ) {
- $version = '';
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $version ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Version number. */
</span><span class="cx" style="display: block; padding: 0 10px"> $version = sprintf( __( '(This message was added in version %s.)' ), $version );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5190,9 +5188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> E_USER_NOTICE
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_null( $version ) ) {
- $version = '';
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $version ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $version = sprintf( '(This message was added in version %s.)', $version );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/plugin.php 2020-07-05 20:30:18 UTC (rev 48326)
+++ trunk/src/wp-includes/plugin.php 2020-07-05 21:07:48 UTC (rev 48327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,10 +620,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag The name of the filter hook.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Array of additional function arguments to be passed to apply_filters().
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the hook.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $replacement Optional. The hook that should have been used. Default null.
- * @param string $message Optional. A message regarding the change. Default null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $replacement Optional. The hook that should have been used. Default empty.
+ * @param string $message Optional. A message regarding the change. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function apply_filters_deprecated( $tag, $args, $version, $replacement = null, $message = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function apply_filters_deprecated( $tag, $args, $version, $replacement = '', $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! has_filter( $tag ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $args[0];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,10 +647,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag The name of the action hook.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Array of additional function arguments to be passed to do_action().
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the hook.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $replacement Optional. The hook that should have been used. Default null.
- * @param string $message Optional. A message regarding the change. Default null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $replacement Optional. The hook that should have been used. Default empty.
+ * @param string $message Optional. A message regarding the change. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function do_action_deprecated( $tag, $args, $version, $replacement = null, $message = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function do_action_deprecated( $tag, $args, $version, $replacement = '', $message = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! has_action( $tag ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>