Ticket #45186: 45186.diff

src/wp-admin/options-discussion.php

@@ -38 +38 @@
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php settings_errors(); ?>
 
 <form method="post" action="options.php">
 <?php settings_fields( 'discussion' ); ?>

src/wp-admin/options-general.php

@@ -55 +55 @@
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php settings_errors(); ?>
 
 <form method="post" action="options.php" novalidate="novalidate">
 <?php settings_fields( 'general' ); ?>

src/wp-admin/options-head.php

@@ -15 +15 @@
         add_settings_error( 'general', 'settings_updated', __( 'Settings saved.' ), 'success' );
 }
 
-settings_errors();
+/*
+ * Display settings errors for non-core files.
+ * For core files, settings_errors() is called after
+ * the first heading on individual settings screens.
+ */
+if ( ! file_exists( ABSPATH . "/wp-admin/$pagenow" ) ) {
+        settings_errors();
+}

src/wp-admin/options-media.php

@@ -48 +48 @@
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php settings_errors(); ?>
 
 <form action="options.php" method="post">
 <?php settings_fields( 'media' ); ?>

src/wp-admin/options-permalink.php

@@ -207 +207 @@
 ?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php settings_errors(); ?>
 
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field( 'update-permalink' ); ?>

src/wp-admin/options-reading.php

@@ -59 +59 @@
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php settings_errors(); ?>
 
 <form method="post" action="options.php">
 <?php

src/wp-admin/options-writing.php

@@ -59 +59 @@
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php settings_errors(); ?>
 
 <form method="post" action="options.php">
 <?php settings_fields( 'writing' ); ?>

src/wp-admin/options.php

@@ -356 +356 @@
 
 <div class="wrap">
         <h1><?php esc_html_e( 'All Settings' ); ?></h1>
+        <?php settings_errors(); ?>
 
         <div class="notice notice-warning">
                 <p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'This page allows direct access to your site settings. You can break things here. Please be cautious!' ); ?></p>