From c66bdb8b5aabd18b3861cdec4ab71166b98ba23f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 8 Jul 2020 13:26:20 +0000
Subject: [PATCH] Widgets: Correct the logic for displaying the `after_widget`
 parameter of the Archives widget.

Follow-up to [48349].

Props mukesh27, joyously.
Fixes #50609.

git-svn-id: https://develop.svn.wordpress.org/trunk@48409 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/general-template.php                     | 1 +
 src/wp-includes/widgets/class-wp-widget-archives.php     | 4 +++-
 src/wp-includes/widgets/class-wp-widget-meta.php         | 1 -
 src/wp-includes/widgets/class-wp-widget-recent-posts.php | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 97d13c3a4c..8d6ab511fb 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -312,6 +312,7 @@ function get_search_form( $args = array() ) {
 			 */
 			$aria_label = '';
 		}
+
 		if ( 'html5' === $format ) {
 			$form = '<form role="search" ' . $aria_label . 'method="get" class="search-form" action="' . esc_url( home_url( '/' ) ) . '">
 				<label>
diff --git a/src/wp-includes/widgets/class-wp-widget-archives.php b/src/wp-includes/widgets/class-wp-widget-archives.php
index f050d6427b..5be28417f1 100644
--- a/src/wp-includes/widgets/class-wp-widget-archives.php
+++ b/src/wp-includes/widgets/class-wp-widget-archives.php
@@ -161,13 +161,15 @@ class WP_Widget_Archives extends WP_Widget {
 				);
 				?>
 			</ul>
+
 			<?php if ( 'html5' === $format ) : ?>
 				</nav>
 			<?php endif; ?>
 
 			<?php
-			echo $args['after_widget'];
 		}
+
+		echo $args['after_widget'];
 	}
 
 	/**
diff --git a/src/wp-includes/widgets/class-wp-widget-meta.php b/src/wp-includes/widgets/class-wp-widget-meta.php
index 275cba0ab8..58eb37248e 100644
--- a/src/wp-includes/widgets/class-wp-widget-meta.php
+++ b/src/wp-includes/widgets/class-wp-widget-meta.php
@@ -67,7 +67,6 @@ class WP_Widget_Meta extends WP_Widget {
 		}
 		?>
 
-
 		<ul>
 			<?php wp_register(); ?>
 			<li><?php wp_loginout(); ?></li>
diff --git a/src/wp-includes/widgets/class-wp-widget-recent-posts.php b/src/wp-includes/widgets/class-wp-widget-recent-posts.php
index 57510a1cee..734455c69c 100644
--- a/src/wp-includes/widgets/class-wp-widget-recent-posts.php
+++ b/src/wp-includes/widgets/class-wp-widget-recent-posts.php
@@ -125,6 +125,7 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 				</li>
 			<?php endforeach; ?>
 		</ul>
+
 		<?php if ( 'html5' === $format ) : ?>
 			</nav>
 		<?php endif; ?>