Ticket #45438: 45438.patch

src/wp-admin/options.php

@@ -222 +222 @@
                 if ( is_multisite() && ! current_user_can( 'manage_network_options' ) ) {
                         wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
                 }
-                $options = explode( ',', wp_unslash( $_POST['page_options'] ) );
+                $options = isset( $_POST['page_options'] ) ? explode( ',', wp_unslash( $_POST['page_options'] ) ) : null;
         } else {
                 $options = $whitelist_options[ $option_page ];
         }
@@ -255 +255 @@
                 }
         }
 
+        $save_count = 0;
+
         if ( $options ) {
                 $user_language_old = get_user_locale();
 
@@ -279 +281 @@
                                         $value = trim( $value );
                                 }
                                 $value = wp_unslash( $value );
+
+                                $save_count++;
                         }
                         update_option( $option, $value );
                 }
@@ -295 +299 @@
                 }
         }
 
+        if ( ! $options || count( $options ) !== $save_count ) {
+                add_settings_error( 'general', 'settings_updated', __( 'Settings save failed.' ), 'error' );
+        }
+
         /**
          * Handle settings errors and return to options page
          */