Changeset 47966 for branches/3.9/src/wp-admin/includes/misc.php

Timestamp:

06/10/2020 06:25:17 PM (6 years ago)

Author:

whyisjake

Message:

General: Backport several commits for release.

• Embeds: Ensure that the title attribute is set correctly on embeds.
• Editor: Prevent HTML decoding on by setting the proper editor context.
• Formatting: Ensure that wp_validate_redirect() sanitizes a wider variety of characters.
• Themes: Ensure a broken theme name is returned properly.
• Administration: Add a new filter to extend set-screen-option.

Merges [47947-47951] to the 3.9 branch.
Props xknown, sstoqnov, vortfu, SergeyBiryukov, whyisjake.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/misc.php (modified) (1 diff)

branches/3.9/src/wp-admin/includes/misc.php

@@ -404 +404 @@
                 break;
             default:
+                if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
+                    /**
+                     * Filters a screen option value before it is set.
+                     *
+                     * The filter can also be used to modify non-standard [items]_per_page
+                     * settings. See the parent function for a full list of standard options.
+                     *
+                     * Returning false to the filter will skip saving the current option.
+                     *
+                     * @since 2.8.0
+                     * @since 5.4.2 Only applied to options ending with '_page',
+                     *              or the 'layout_columns' option.
+                     *
+                     * @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.
+                     */
+                    $value = apply_filters( 'set-screen-option', false, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+                }
 
                 /**
                  * Filter a screen option value before it is set.
                  *
-                 * The filter can also be used to modify non-standard [items]_per_page
-                 * settings. See the parent function for a full list of standard options.
+                 * The dynamic portion of the hook, `$option`, refers to the option name.
                  *
                  * Returning false to the filter will skip saving the current option.
                  *
-                 * @since 2.8.0
+                 * @since 5.4.2
                  *
                  * @see set_screen_options()
                  *
-                 * @param bool|int $value  Screen option value. Default false to skip.
-                 * @param string   $option The option name.
-                 * @param int      $value  The number of rows to use.
+                 * @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.
                  */
-                $value = apply_filters( 'set-screen-option', false, $option, $value );
+                $value = apply_filters( "set_screen_option_{$option}", false, $option, $value );
 
                 if ( false === $value )