Fix duplicate use of wp-header-end (#1943)

Author: pfefferle

.github/changelog/1943-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Prevent WordPress from loading all admin notices twice on ActivityPub settings pages.

includes/wp-admin/class-admin.php

@@ -87,22 +87,6 @@ public static function admin_notices() {
 		}
 	}
 
-	/**
-	 * Display one admin menu notice about configuration problems or conflicts.
-	 *
-	 * @param string $admin_notice The notice to display.
-	 * @param string $level        The level of the notice (error, warning, success, info).
-	 */
-	private static function show_admin_notice( $admin_notice, $level ) {
-		?>
-
-		<div class="notice notice-<?php echo esc_attr( $level ); ?>">
-			<p><?php echo wp_kses( $admin_notice, 'data' ); ?></p>
-		</div>
-
-		<?php
-	}
-
 	/**
 	 * Load user settings page
 	 */

templates/admin-header.php

@@ -33,4 +33,3 @@
 		</nav>
 	</div>
 </div>
-<hr class="wp-header-end">

templates/advanced-settings.php

@@ -7,6 +7,8 @@
 
 ?>
 
+<hr class="wp-header-end">
+
 <div class="activitypub-settings activitypub-settings-page hide-if-no-js">
 	<form method="post" action="options.php">
 		<?php \settings_fields( 'activitypub_advanced' ); ?>

templates/blog-settings.php

@@ -7,6 +7,8 @@
 
 ?>
 
+<hr class="wp-header-end">
+
 <div class="activitypub-settings activitypub-settings-page hide-if-no-js">
 	<form method="post" action="options.php">
 		<?php \settings_fields( 'activitypub_blog' ); ?>

templates/settings.php

@@ -7,6 +7,8 @@
 
 ?>
 
+<hr class="wp-header-end">
+
 <div class="activitypub-settings activitypub-settings-page hide-if-no-js">
 	<form method="post" action="options.php">
 		<?php \settings_fields( 'activitypub' ); ?>

templates/welcome.php

@@ -13,6 +13,8 @@
 );
 ?>
 
+<hr class="wp-header-end">
+
 <div class="activitypub-settings activitypub-welcome-page hide-if-no-js">
 	<?php do_settings_sections( 'activitypub_welcome' ); ?>
 </div>