Changeset 48823

Timestamp:

08/19/2020 01:57:29 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Comments: Revert unintended changes from [48822].

See #51044.

File:

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

trunk/src/wp-admin/includes/misc.php

@@ -689 +689 @@
                                 break;
                         default:
+                                $screen_option = false;
+
                                 if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
                                         /**
@@ -709 +711 @@
                                          * @param int    $value         The option value.
                                          */
-                                        $value = apply_filters( 'set-screen-option', false, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-                                } else {
-                                        /**
-                                         * Filters a screen option value before it is set.
-                                         *
-                                         * The dynamic portion of the hook, `$option`, refers to the option name.
-                                         *
-                                         * Returning false from the filter will skip saving the current option.
-                                         *
-                                         * @since 5.4.2
-                                         * @since 5.4.3 Only applied to options not ending with '_page',
-                                         *              and not the 'layout_columns' option.
-                                         *
-                                         * @see set_screen_options()
-                                         *
-                                         * @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 );
+                                        $screen_option = apply_filters( 'set-screen-option', $screen_option, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
                                 }
+
+                                /**
+                                 * Filters a screen option value before it is set.
+                                 *
+                                 * The dynamic portion of the hook, `$option`, refers to the option name.
+                                 *
+                                 * Returning false from the filter will skip saving the current option.
+                                 *
+                                 * @since 5.4.2
+                                 *
+                                 * @see set_screen_options()
+                                 *
+                                 * @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}", $screen_option, $option, $value );
 
                                 if ( false === $value ) {