From c4a2b9a9e4e0f8e72d0843139cac04605ab57fcf Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 8 Jul 2020 13:44:04 +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.
Built from https://develop.svn.wordpress.org/trunk@48410


git-svn-id: http://core.svn.wordpress.org/trunk@48179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/version.php                              | 2 +-
 wp-includes/widgets/class-wp-widget-archives.php     | 7 +++----
 wp-includes/widgets/class-wp-widget-categories.php   | 7 +++----
 wp-includes/widgets/class-wp-widget-meta.php         | 8 ++++----
 wp-includes/widgets/class-wp-widget-pages.php        | 8 ++++----
 wp-includes/widgets/class-wp-widget-recent-posts.php | 8 ++++----
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4b05dfc602..4b9c130527 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta1-48409';
+$wp_version = '5.5-beta1-48410';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/widgets/class-wp-widget-archives.php b/wp-includes/widgets/class-wp-widget-archives.php
index 5be28417f1..498ce6b21b 100644
--- a/wp-includes/widgets/class-wp-widget-archives.php
+++ b/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/wp-includes/widgets/class-wp-widget-categories.php b/wp-includes/widgets/class-wp-widget-categories.php
index dee9a040a7..ce1164ebd3 100644
--- a/wp-includes/widgets/class-wp-widget-categories.php
+++ b/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/wp-includes/widgets/class-wp-widget-meta.php b/wp-includes/widgets/class-wp-widget-meta.php
index 58eb37248e..5e58d0eb44 100644
--- a/wp-includes/widgets/class-wp-widget-meta.php
+++ b/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/wp-includes/widgets/class-wp-widget-pages.php b/wp-includes/widgets/class-wp-widget-pages.php
index de1d4894f9..5519dae264 100644
--- a/wp-includes/widgets/class-wp-widget-pages.php
+++ b/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/wp-includes/widgets/class-wp-widget-recent-posts.php b/wp-includes/widgets/class-wp-widget-recent-posts.php
index 734455c69c..4b2fd56532 100644
--- a/wp-includes/widgets/class-wp-widget-recent-posts.php
+++ b/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'];
 	}