From 5342b33a0ba0ebe619a1ac2098e74f6842627dd1 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Fri, 24 Nov 2017 05:21:51 +0000
Subject: [PATCH] Template: Don't output an empty `<ul>` in `the_meta()` when a
 post only has protected metas.

Props campusboy1987, birgire.
Fixes #42629.

Built from https://develop.svn.wordpress.org/trunk@42225


git-svn-id: http://core.svn.wordpress.org/trunk@42054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/post-template.php | 9 ++++++---
 wp-includes/version.php       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index b80ac4d4e4..5443340970 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -1016,7 +1016,7 @@ function post_custom( $key = '' ) {
  */
 function the_meta() {
 	if ( $keys = get_post_custom_keys() ) {
-		echo "<ul class='post-meta'>\n";
+		$li_html = '';
 		foreach ( (array) $keys as $key ) {
 			$keyt = trim( $key );
 			if ( is_protected_meta( $keyt, 'post' ) ) {
@@ -1041,9 +1041,12 @@ function the_meta() {
 			 * @param string $key   Meta key.
 			 * @param string $value Meta value.
 			 */
-			echo apply_filters( 'the_meta_key', $html, $key, $value );
+			$li_html .= apply_filters( 'the_meta_key', $html, $key, $value );
+		}
+
+		if ( $li_html ) {
+			echo "<ul class='post-meta'>\n{$li_html}</ul>\n";
 		}
-		echo "</ul>\n";
 	}
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e6bf0ec256..16bc5121b1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42224';
+$wp_version = '5.0-alpha-42225';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.