Ticket #18954: 18954.patch

src/wp-admin/includes/misc.php

@@ -365 +365 @@
  */
 function set_screen_options() {
 
-        if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
+        if ( isset( $_POST['wp_screen_options'] ) && is_array( $_POST['wp_screen_options'] ) ) {
                 check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
 
-                if ( !$user = wp_get_current_user() )
+                if ( ! $user = wp_get_current_user() ) {
                         return;
+                }
+
                 $option = $_POST['wp_screen_options']['option'];
-                $value = $_POST['wp_screen_options']['value'];
+                $value  = (int) $_POST['wp_screen_options']['value'];
 
-                if ( $option != sanitize_key( $option ) )
+                if ( $option != sanitize_key( $option ) ) {
+                        return;
+                }
+                if ( $value < 1 || $value > 999 ) {
                         return;
+                }
 
-                $map_option = $option;
-                $type = str_replace('edit_', '', $map_option);
-                $type = str_replace('_per_page', '', $type);
-                if ( in_array( $type, get_taxonomies() ) )
-                        $map_option = 'edit_tags_per_page';
-                elseif ( in_array( $type, get_post_types() ) )
-                        $map_option = 'edit_per_page';
-                else
-                        $option = str_replace('-', '_', $option);
-
-                switch ( $map_option ) {
-                        case 'edit_per_page':
-                        case 'users_per_page':
-                        case 'edit_comments_per_page':
-                        case 'upload_per_page':
-                        case 'edit_tags_per_page':
-                        case 'plugins_per_page':
-                        // Network admin
-                        case 'sites_network_per_page':
-                        case 'users_network_per_page':
-                        case 'site_users_network_per_page':
-                        case 'plugins_network_per_page':
-                        case 'themes_network_per_page':
-                        case 'site_themes_network_per_page':
-                                $value = (int) $value;
-                                if ( $value < 1 || $value > 999 )
-                                        return;
-                                break;
-                        default:
-
-                                /**
-                                 * 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.
-                                 *
-                                 * Returning false to the filter will skip saving the current option.
-                                 *
-                                 * @since 2.8.0
-                                 *
-                                 * @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.
-                                 */
-                                $value = apply_filters( 'set-screen-option', false, $option, $value );
-
-                                if ( false === $value )
-                                        return;
-                                break;
+                $option = str_replace( '-', '_', $option );
+
+                /**
+                 * Filter a screen option value before it is set.
+                 *
+                 * Returning false to the filter will skip saving the current option.
+                 *
+                 * @since 2.8.0
+                 *
+                 * @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.
+                 */
+                $filtered = apply_filters( 'set-screen-option', false, $option, $value );
+
+                // Check for null to handle filters that return nothing
+                if ( null !== $filtered ) {
+                        $value = $filtered;
+                }
+                if ( false === $value ) {
+                        return;
                 }
 
-                update_user_meta($user->ID, $option, $value);
-                wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
+                update_user_meta( $user->ID, $option, $value );
+                wp_safe_redirect( remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() ) );
                 exit;
         }
 }