Changeset 48327 for trunk/src/wp-includes/plugin.php

Timestamp:

07/05/2020 09:07:48 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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 [46792].

Props jignesh.nakrani, renathoc, SergeyBiryukov.
Fixes #49698.

File:

• trunk/src/wp-includes/plugin.php (modified) (2 diffs)

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 null.
- * @param string $message     Optional. A message regarding the change. Default null.
- */
-function apply_filters_deprecated( $tag, $args, $version, $replacement = null, $message = null ) {
+ * @param string $replacement Optional. The hook that should have been used. Default empty.
+ * @param string $message     Optional. A message regarding the change. Default empty.
+ */
+function apply_filters_deprecated( $tag, $args, $version, $replacement = '', $message = '' ) {
     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. Default null.
- * @param string $message     Optional. A message regarding the change. Default null.
- */
-function do_action_deprecated( $tag, $args, $version, $replacement = null, $message = null ) {
+ * @param string $replacement Optional. The hook that should have been used. Default empty.
+ * @param string $message     Optional. A message regarding the change. Default empty.
+ */
+function do_action_deprecated( $tag, $args, $version, $replacement = '', $message = '' ) {
     if ( ! has_action( $tag ) ) {
         return;