From 468bcce1a2a717374f0bfdfa673683870c9926d7 Mon Sep 17 00:00:00 2001
From: "Alejandro J. Sanchez P" <alejandro.s@onthegosystems.com>
Date: Sun, 5 Jun 2022 12:00:57 +0200
Subject: [PATCH] Removing notice jumps in settings pages.

---
 src/wp-admin/admin-header.php       | 4 ++--
 src/wp-admin/options-discussion.php | 1 +
 src/wp-admin/options-general.php    | 1 +
 src/wp-admin/options-media.php      | 1 +
 src/wp-admin/options-permalink.php  | 1 +
 src/wp-admin/options-reading.php    | 1 +
 src/wp-admin/options-writing.php    | 1 +
 src/wp-admin/options.php            | 1 +
 8 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php
index 3306c9125b..7ed01544d4 100644
--- a/src/wp-admin/admin-header.php
+++ b/src/wp-admin/admin-header.php
@@ -310,6 +310,6 @@ if ( is_network_admin() ) {
  */
 do_action( 'all_admin_notices' );
 
-if ( 'options-general.php' === $parent_file ) {
+/* if ( 'options-general.php' === $parent_file ) {
 	require ABSPATH . 'wp-admin/options-head.php';
-}
+*/
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index b83d822f2f..dde3e51245 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -38,6 +38,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php require ABSPATH . 'wp-admin/options-head.php'; ?>
 
 <form method="post" action="options.php">
 <?php settings_fields( 'discussion' ); ?>
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
index 20c83fb1d8..59bd991927 100644
--- a/src/wp-admin/options-general.php
+++ b/src/wp-admin/options-general.php
@@ -55,6 +55,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php require ABSPATH . 'wp-admin/options-head.php'; ?>
 
 <form method="post" action="options.php" novalidate="novalidate">
 <?php settings_fields( 'general' ); ?>
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index 79f4389e88..6efbd59524 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -48,6 +48,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php require ABSPATH . 'wp-admin/options-head.php'; ?>
 
 <form action="options.php" method="post">
 <?php settings_fields( 'media' ); ?>
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 87191625c7..617f7ad2cc 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -207,6 +207,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 ?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php require ABSPATH . 'wp-admin/options-head.php'; ?>
 
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field( 'update-permalink' ); ?>
diff --git a/src/wp-admin/options-reading.php b/src/wp-admin/options-reading.php
index 2c89f14474..c6f1550080 100644
--- a/src/wp-admin/options-reading.php
+++ b/src/wp-admin/options-reading.php
@@ -59,6 +59,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php require ABSPATH . 'wp-admin/options-head.php'; ?>
 
 <form method="post" action="options.php">
 <?php
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index e33c1df4f9..ea35c12d45 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -59,6 +59,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
+<?php require ABSPATH . 'wp-admin/options-head.php'; ?>
 
 <form method="post" action="options.php">
 <?php settings_fields( 'writing' ); ?>
diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php
index d63b10eb4f..27482c3507 100644
--- a/src/wp-admin/options.php
+++ b/src/wp-admin/options.php
@@ -356,6 +356,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
 
 <div class="wrap">
 	<h1><?php esc_html_e( 'All Settings' ); ?></h1>
+	<?php require ABSPATH . 'wp-admin/options-head.php'; ?>
 
 	<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>
-- 
2.30.1.windows.1