From 5fa2de51ef56cf6a3c1910e87d1657e0604f9643 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sat, 1 Jul 2017 14:23:41 +0000
Subject: [PATCH] General: Ensure `$description` gets initialized in
 `get_the_archive_description()` if the post type archive conditional is true
 and the description isn't set.

Props henrywright.
See #38487.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 2 ++
 wp-includes/version.php          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 5ee4e20b4b..026d190108 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -1565,6 +1565,8 @@ function get_the_archive_description() {
 		// Check if a description is set.
 		if ( isset( $post_type_obj->description ) ) {
 			$description = $post_type_obj->description;
+		} else {
+			$description = '';
 		}
 	} else {
 		$description = term_description();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4406afd540..bf229e7cfd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-40982';
+$wp_version = '4.9-alpha-40983';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.