WordPress.org
Get WordPress

Make WordPress Core

Ticket #46937: 46937.diff

File 46937.diff, 10.1 KB (added by afragen, 7 years ago)

  • wp-admin/includes/update-core.php 

    diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index b0b86166ad..57444787e6 100644
    a b function update_core( $from, $to ) {  
    946946                $wp_filesystem->delete( $from, true );
    947947        }
    948948
     949        /* translators: %s: Update PHP page URL */
     950        $php_update_message = '<br>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
     951
     952        $annotation = wp_get_update_php_annotation();
     953
     954        if ( $annotation ) {
     955                $php_update_message .= '<br><em>' . $annotation . '</em>';
     956        }
     957
    949958        if ( ! $mysql_compat && ! $php_compat ) {
    950                 return new WP_Error( 'php_mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) );
     959                return new WP_Error( 'php_mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message );
    951960        } elseif ( ! $php_compat ) {
    952                 return new WP_Error( 'php_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ) );
     961                return new WP_Error( 'php_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ) . $php_update_message );
    953962        } elseif ( ! $mysql_compat ) {
    954963                return new WP_Error( 'mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version ) );
    955964        }

  • wp-admin/install.php 

    diff --git a/wp-admin/install.php b/wp-admin/install.php
index 4a38eab1cd..6c93a27732 100644
    a b $version_url = sprintf(  
    243243        sanitize_title( $wp_version )
    244244);
    245245
     246/* translators: %s: Update PHP page URL */
     247$php_update_message = '<br>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
     248
     249$annotation = wp_get_update_php_annotation();
     250
     251if ( $annotation ) {
     252        $php_update_message .= '<br><em>' . $annotation . '</em>';
     253}
     254
    246255if ( ! $mysql_compat && ! $php_compat ) {
    247256        /* 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 */
    248         $compat = sprintf( __( 'You cannot install 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 );
     257        $compat = sprintf( __( 'You cannot install 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;
    249258} elseif ( ! $php_compat ) {
    250259        /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
    251         $compat = sprintf( __( 'You cannot install 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 );
     260        $compat = sprintf( __( 'You cannot install 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;
    252261} elseif ( ! $mysql_compat ) {
    253262        /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
    254263        $compat = sprintf( __( 'You cannot install 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 );

  • wp-admin/update-core.php 

    diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 570703e5d8..dd18d7b345 100644
    a b function list_core_update( $update ) {  
    7676                                sanitize_title( $update->current )
    7777                        );
    7878
     79                        /* translators: %s: Update PHP page URL */
     80                        $php_update_message = '<br>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
     81
     82                        $annotation = wp_get_update_php_annotation();
     83
     84                        if ( $annotation ) {
     85                                $php_update_message .= '<br><em>' . $annotation . '</em>';
     86                        }
     87
    7988                        if ( ! $mysql_compat && ! $php_compat ) {
    8089                                /* 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 */
    81                                 $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, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
     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, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ) . $php_update_message;
    8291                        } elseif ( ! $php_compat ) {
    8392                                /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
    84                                 $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, $update->current, $update->php_version, $php_version );
     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, $update->current, $update->php_version, $php_version ) . $php_update_message;
    8594                        } elseif ( ! $mysql_compat ) {
    8695                                /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
    8796                                $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, $update->current, $update->mysql_version, $mysql_version );

  • wp-admin/upgrade.php 

    diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 330ef0fd9d..fc3e468325 100644
    a b if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {  
    5454        $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
    5555}
    5656
     57/* translators: %s: Update PHP page URL */
     58$php_update_message = '<br>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
     59
     60$annotation = wp_get_update_php_annotation();
     61
     62if ( $annotation ) {
     63        $php_update_message .= '<br><em>' . $annotation . '</em>';
     64}
     65
    5766@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
    5867?>
    5968<!DOCTYPE html>
    … … elseif ( ! $php_compat || ! $mysql_compat ) :  
    8796
    8897        if ( ! $mysql_compat && ! $php_compat ) {
    8998                /* 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 );
     99                $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;
    91100        } elseif ( ! $php_compat ) {
    92101                /* 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 );
     102                $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;
    94103        } elseif ( ! $mysql_compat ) {
    95104                /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
    96105                $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 );