WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Drew Jaynes 2017-07-01 14:23:41 +00:00
parent cb81009729
commit 5fa2de51ef
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/general-template.php
View File

@ -1565,6 +1565,8 @@ function get_the_archive_description() {
// Check if a description is set. // Check if a description is set.
if ( isset( $post_type_obj->description ) ) { if ( isset( $post_type_obj->description ) ) {
$description = $post_type_obj->description; $description = $post_type_obj->description;
} else {
$description = '';
} }
} else { } else {
$description = term_description(); $description = term_description();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.