From a2e273944af122c77c6c9d21fe4aaf3f91467044 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 12 Apr 2019 21:52:52 +0000
Subject: [PATCH] Plugins: In `list_plugin_updates()`, only display the
 annotation and the surrounding tags if it's not empty.

Props afragen.
Fixes #46680.
Built from https://develop.svn.wordpress.org/trunk@45184


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

diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 8fd29fb836..555d67efab 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -304,7 +304,12 @@ function list_plugin_updates() {
 				__( '<a href="%s">Learn more about updating PHP.</a>' ),
 				esc_url( wp_get_update_php_url() )
 			);
-			$compat .= '</p><p><em>' . wp_get_update_php_annotation() . '</em>';
+
+			$annotation = wp_get_update_php_annotation();
+
+			if ( $annotation ) {
+				$compat .= '</p><p><em>' . $annotation . '</em>';
+			}
 		}
 
 		// Get the upgrade notice for the new plugin version.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 57d8ac0ed6..290293aecb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-beta3-45183';
+$wp_version = '5.2-beta3-45184';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.