Make WordPress Core


Ignore:
Timestamp:
05/17/2019 06:15:41 PM (8 years ago)
Author:
SergeyBiryukov
Message:

Upgrade/Install: Improve error messages displayed when WordPress update fails due to an incompatible PHP version by linking to the Update PHP support page.

Additionally, fix a regression in [44451] where the error message in wp-admin/upgrade.php was prepared, but never displayed.

Props afragen, netweb, hareesh-pillai, SergeyBiryukov.
Merges [45357] to the 5.2 branch.
Fixes #46937.

Location:
branches/5.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/5.2

  • branches/5.2/src/wp-admin/upgrade.php

    r45233 r45358  
    8686        );
    8787
     88        /* translators: %s: Update PHP page URL */
     89        $php_update_message = '</p><p>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
     90
     91        $annotation = wp_get_update_php_annotation();
     92        if ( $annotation ) {
     93                $php_update_message .= '</p><p><em>' . $annotation . '</em>';
     94        }
     95
    8896        if ( ! $mysql_compat && ! $php_compat ) {
    8997                /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
    90                 $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
     98                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message;
    9199        } elseif ( ! $php_compat ) {
    92100                /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
    93                 $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version );
     101                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version ) . $php_update_message;
    94102        } elseif ( ! $mysql_compat ) {
    95103                /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
    96104                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_mysql_version, $mysql_version );
    97105        }
     106
     107        echo '<p>' . $message . '</p>';
    98108        ?>
    99109        <?php
Note: See TracChangeset for help on using the changeset viewer.