From 0998a579919d49e38d4b98f6f21b9e71b5a24541 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 1 Jul 2020 09:53:39 +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. Follow-up to [47951]. Props Chouby, sswells, SergeyBiryukov. Merges [48241] to the 4.2 branch. Fixes #50392. Built from https://develop.svn.wordpress.org/branches/4.2@48256 git-svn-id: http://core.svn.wordpress.org/branches/4.2@48025 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/misc.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index 25595b65fa..b91070d267 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -405,6 +405,8 @@ function set_screen_options() { return; break; default: + $screen_option = false; + if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) { /** * Filters a screen option value before it is set. @@ -420,12 +422,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 } /** @@ -439,12 +441,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;