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

Site Health: Avoid "Undefined property" PHP notices in `wp_dashboard_site_health()` when the status result transient does not exist yet. 

Props dlh for initial patch.
See #47606.
Built from https://develop.svn.wordpress.org/trunk@47069


git-svn-id: http://core.svn.wordpress.org/trunk@46869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-01-13 17:27:06 +00:00
parent 4a9c0e35e1
commit 10ae398727
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/dashboard.php
View File

@ -1772,21 +1772,21 @@ function dashboard_php_nag_class( $classes ) {
function wp_dashboard_site_health() { function wp_dashboard_site_health() {
$get_issues = get_transient( 'health-check-site-status-result' ); $get_issues = get_transient( 'health-check-site-status-result' );
$issue_counts = new stdClass(); $issue_counts = array();
if ( false !== $get_issues ) { if ( false !== $get_issues ) {
$issue_counts = json_decode( $get_issues ); $issue_counts = json_decode( $get_issues, true );
} }
if ( ! is_object( $issue_counts ) || empty( $issue_counts ) ) { if ( ! is_array( $issue_counts ) || ! $issue_counts ) {
$issue_counts = (object) array( $issue_counts = array(
'good' => 0, 'good' => 0,
'recommended' => 0, 'recommended' => 0,
'critical' => 0, 'critical' => 0,
); );
} }
$issues_total = $issue_counts->recommended + $issue_counts->critical; $issues_total = $issue_counts['recommended'] + $issue_counts['critical'];
?> ?>
<div class="health-check-title-section site-health-progress-wrapper loading hide-if-no-js"> <div class="health-check-title-section site-health-progress-wrapper loading hide-if-no-js">
<div class="site-health-progress"> <div class="site-health-progress">
@ -1821,7 +1821,7 @@ function wp_dashboard_site_health() {
<?php else : ?> <?php else : ?>
<p> <p>
<?php if ( $issue_counts->critical > 0 ) : ?> <?php if ( $issue_counts['critical'] > 0 ) : ?>
<?php _e( 'Your site has critical issues that should be addressed as soon as possible to improve the performance or security of your website.' ); ?> <?php _e( 'Your site has critical issues that should be addressed as soon as possible to improve the performance or security of your website.' ); ?>
<?php elseif ( $issues_total <= 0 ) : ?> <?php elseif ( $issues_total <= 0 ) : ?>
<?php _e( 'Great job! Your site currently passes all site health checks.' ); ?> <?php _e( 'Great job! Your site currently passes all site health checks.' ); ?>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-47068'; $wp_version = '5.4-alpha-47069';
/** /**
* 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.