From 48f0e742799f4ed40274c21d3a22f12e9be14b8b Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 30 Jun 2020 21:51:47 +0000 Subject: [PATCH] Administration: Pass the result of `set-screen-option` filter to the new `set_screen_option_{$option}` filter to ensure backward compatibility. Rename the `$keep` parameter of both filters to `$screen_option` for clarity, update the documentation to better reflect its purpose. Props Chouby, sswells, SergeyBiryukov. Fixes #50392. git-svn-id: https://develop.svn.wordpress.org/trunk@48241 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/misc.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php index 7259a6f512..6e8915b6bd 100644 --- a/src/wp-admin/includes/misc.php +++ b/src/wp-admin/includes/misc.php @@ -688,6 +688,8 @@ function set_screen_options() { } break; default: + $screen_option = false; + if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) { /** * Filters a screen option value before it is set. @@ -703,12 +705,12 @@ function set_screen_options() { * * @see set_screen_options() * - * @param bool $keep Whether to save or skip saving the screen option value. - * Default false. - * @param string $option The option name. - * @param int $value The number of rows to use. + * @param mixed $screen_option The value to save instead of the option value. + * Default false (to skip saving the current option). + * @param string $option The option name. + * @param int $value The option value. */ - $value = apply_filters( 'set-screen-option', false, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores + $screen_option = apply_filters( 'set-screen-option', $screen_option, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } /** @@ -722,12 +724,12 @@ function set_screen_options() { * * @see set_screen_options() * - * @param bool $keep Whether to save or skip saving the screen option value. - * Default false. - * @param string $option The option name. - * @param int $value The number of rows to use. + * @param mixed $screen_option The value to save instead of the option value. + * Default false (to skip saving the current option). + * @param string $option The option name. + * @param int $value The option value. */ - $value = apply_filters( "set_screen_option_{$option}", false, $option, $value ); + $value = apply_filters( "set_screen_option_{$option}", $screen_option, $option, $value ); if ( false === $value ) { return;