From c3993eb19dee52dfd6ca9f9ef7cec785538e361d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 8 Jul 2020 13:42:30 +0000
Subject: [PATCH] Widgets: Adjust formatting for displaying the closing
 `</nav>` tag in widgets for consistency with the opening tag.

Follow-up to [48349].

See #48170.

git-svn-id: https://develop.svn.wordpress.org/trunk@48410 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/widgets/class-wp-widget-archives.php     | 7 +++----
 src/wp-includes/widgets/class-wp-widget-categories.php   | 7 +++----
 src/wp-includes/widgets/class-wp-widget-meta.php         | 8 ++++----
 src/wp-includes/widgets/class-wp-widget-pages.php        | 8 ++++----
 src/wp-includes/widgets/class-wp-widget-recent-posts.php | 8 ++++----
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/wp-includes/widgets/class-wp-widget-archives.php b/src/wp-includes/widgets/class-wp-widget-archives.php
index 5be28417f1..498ce6b21b 100644
--- a/src/wp-includes/widgets/class-wp-widget-archives.php
+++ b/src/wp-includes/widgets/class-wp-widget-archives.php
@@ -162,11 +162,10 @@ class WP_Widget_Archives extends WP_Widget {
 				?>
 			</ul>
 
-			<?php if ( 'html5' === $format ) : ?>
-				</nav>
-			<?php endif; ?>
-
 			<?php
+			if ( 'html5' === $format ) {
+				echo '</nav>';
+			}
 		}
 
 		echo $args['after_widget'];
diff --git a/src/wp-includes/widgets/class-wp-widget-categories.php b/src/wp-includes/widgets/class-wp-widget-categories.php
index dee9a040a7..ce1164ebd3 100644
--- a/src/wp-includes/widgets/class-wp-widget-categories.php
+++ b/src/wp-includes/widgets/class-wp-widget-categories.php
@@ -140,11 +140,10 @@ class WP_Widget_Categories extends WP_Widget {
 				?>
 			</ul>
 
-			<?php if ( 'html5' === $format ) : ?>
-				</nav>
-			<?php endif; ?>
-
 			<?php
+			if ( 'html5' === $format ) {
+				echo '</nav>';
+			}
 		}
 
 		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 58eb37248e..5e58d0eb44 100644
--- a/src/wp-includes/widgets/class-wp-widget-meta.php
+++ b/src/wp-includes/widgets/class-wp-widget-meta.php
@@ -98,11 +98,11 @@ class WP_Widget_Meta extends WP_Widget {
 
 		</ul>
 
-		<?php if ( 'html5' === $format ) : ?>
-			</nav>
-		<?php endif; ?>
-
 		<?php
+		if ( 'html5' === $format ) {
+			echo '</nav>';
+		}
+
 		echo $args['after_widget'];
 	}
 
diff --git a/src/wp-includes/widgets/class-wp-widget-pages.php b/src/wp-includes/widgets/class-wp-widget-pages.php
index de1d4894f9..5519dae264 100644
--- a/src/wp-includes/widgets/class-wp-widget-pages.php
+++ b/src/wp-includes/widgets/class-wp-widget-pages.php
@@ -108,11 +108,11 @@ class WP_Widget_Pages extends WP_Widget {
 				<?php echo $out; ?>
 			</ul>
 
-			<?php if ( 'html5' === $format ) : ?>
-				</nav>
-			<?php endif; ?>
-
 			<?php
+			if ( 'html5' === $format ) {
+				echo '</nav>';
+			}
+
 			echo $args['after_widget'];
 		}
 	}
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 734455c69c..4b2fd56532 100644
--- a/src/wp-includes/widgets/class-wp-widget-recent-posts.php
+++ b/src/wp-includes/widgets/class-wp-widget-recent-posts.php
@@ -126,11 +126,11 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 			<?php endforeach; ?>
 		</ul>
 
-		<?php if ( 'html5' === $format ) : ?>
-			</nav>
-		<?php endif; ?>
-
 		<?php
+		if ( 'html5' === $format ) {
+			echo '</nav>';
+		}
+
 		echo $args['after_widget'];
 	}