Ticket #56199: 56199.diff
| File 56199.diff, 11.2 KB (added by , 2 years ago) |
|---|
-
src/wp-admin/css/dashboard.css
1186 1186 padding-right: 6px; 1187 1187 } 1188 1188 1189 #dashboard_php_nag.php-insecure .dashicons-warning { 1189 #dashboard_php_nag.php-no-security-updates .dashicons-warning, 1190 #dashboard_php_nag.php-version-lower-than-future-minimum .dashicons-warning { 1190 1191 color: #d63638; 1191 1192 } 1192 1193 … … 1198 1199 margin: 12px 0; 1199 1200 } 1200 1201 1201 #dashboard_php_nag h3 {1202 font-weight: 600;1203 }1204 1205 1202 #dashboard_php_nag .button .dashicons-external { 1206 1203 line-height: 25px; 1207 1204 } 1208 1205 1206 .bigger-bolder-text { 1207 font-weight: 600; 1208 font-size: 14px; 1209 } 1210 1209 1211 /* =Media Queries 1210 1212 -------------------------------------------------------------- */ 1211 1213 -
src/wp-admin/includes/class-wp-site-health.php
741 741 '<p>%s</p>', 742 742 sprintf( 743 743 /* translators: %s: The minimum recommended PHP version. */ 744 __( 'PHP is the programming language used to build and maintain WordPress. Newer versions of PHP are created with increased performance in mind, so you may see a positive effect onyour site’s performance. The minimum recommended version of PHP is %s.' ),744 __( 'PHP is one of the programming languages used to build WordPress. Newer versions of PHP receive regular security updates and may increase your site’s performance. The minimum recommended version of PHP is %s.' ), 745 745 $response ? $response['recommended_version'] : '' 746 746 ) 747 747 ), … … 764 764 if ( $response['is_supported'] ) { 765 765 $result['label'] = sprintf( 766 766 /* translators: %s: The server PHP version. */ 767 __( 'Your site is running an older version of PHP (%s)' ),767 __( 'Your site is running on an older version of PHP (%s)' ), 768 768 PHP_VERSION 769 769 ); 770 770 $result['status'] = 'recommended'; … … 772 772 return $result; 773 773 } 774 774 775 // The PHP version is still receiving security fixes, but is lower than 776 // the expected minimum version that will be required by WordPress in the near future. 777 if ( $response['is_secure'] && $response['is_lower_than_future_minimum'] ) { 778 // The `is_secure` array key name doesn't actually imply this is a secure version of PHP. It only means it receives security updates. 779 780 $result['label'] = sprintf( 781 /* translators: %s: The server PHP version. */ 782 __( 'Your site is running on an outdated version of PHP (%s), which soon will not be supported by WordPress.' ), 783 PHP_VERSION 784 ); 785 786 $result['status'] = 'critical'; 787 $result['badge']['label'] = __( 'Requirements' ); 788 789 return $result; 790 } 791 775 792 // The PHP version is only receiving security fixes. 776 793 if ( $response['is_secure'] ) { 777 794 $result['label'] = sprintf( 778 795 /* translators: %s: The server PHP version. */ 779 __( 'Your site is running an older version of PHP (%s), which should be updated' ),796 __( 'Your site is running on an older version of PHP (%s), which should be updated' ), 780 797 PHP_VERSION 781 798 ); 782 799 $result['status'] = 'recommended'; … … 784 801 return $result; 785 802 } 786 803 787 // Anything no longer secure must be updated. 788 $result['label'] = sprintf( 789 /* translators: %s: The server PHP version. */ 790 __( 'Your site is running an outdated version of PHP (%s), which requires an update' ), 791 PHP_VERSION 792 ); 793 $result['status'] = 'critical'; 804 // No more security updates for the PHP version, and lower than the expected minimum version required by WordPress. 805 if ( $response['is_lower_than_future_minimum'] ) { 806 $message = sprintf( 807 /* translators: %s: The server PHP version. */ 808 __( 'Your site is running on an outdated version of PHP (%s), which does not receive security updates and soon will not be supported by WordPress.' ), 809 PHP_VERSION 810 ); 811 } else { 812 // No more security updates for the PHP version, must be updated. 813 $message = sprintf( 814 /* translators: %s: The server PHP version. */ 815 __( 'Your site is running on an outdated version of PHP (%s), which does not receive security updates. It should be updated.' ), 816 PHP_VERSION 817 ); 818 } 819 820 $result['label'] = $message; 821 $result['status'] = 'critical'; 822 794 823 $result['badge']['label'] = __( 'Security' ); 795 824 796 825 return $result; -
src/wp-admin/includes/dashboard.php
20 20 function wp_dashboard_setup() { 21 21 global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks; 22 22 23 $wp_dashboard_control_callbacks = array(); 24 $screen = get_current_screen(); 23 $screen = get_current_screen(); 25 24 26 25 /* Register Widgets and Controls */ 26 $wp_dashboard_control_callbacks = array(); 27 27 28 $response = wp_check_browser_version(); 28 // Browser version 29 $check_browser = wp_check_browser_version(); 29 30 30 if ( $ response && $response['upgrade'] ) {31 if ( $check_browser && $check_browser['upgrade'] ) { 31 32 add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' ); 32 33 33 if ( $ response['insecure'] ) {34 if ( $check_browser['insecure'] ) { 34 35 wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' ); 35 36 } else { 36 37 wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' ); … … 38 39 } 39 40 40 41 // PHP Version. 41 $ response= wp_check_php_version();42 $check_php = wp_check_php_version(); 42 43 43 if ( $ response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable']44 && current_user_can( 'update_php' )45 ) {46 add_filter( 'postbox_classes_dashboard_dashboard_php_nag', 'dashboard_php_nag_class' );44 if ( $check_php && current_user_can( 'update_php' ) ) { 45 // If "not acceptable" the widget will be shown. 46 if ( isset( $check_php['is_acceptable'] ) && ! $check_php['is_acceptable'] ) { 47 add_filter( 'postbox_classes_dashboard_dashboard_php_nag', 'dashboard_php_nag_class' ); 47 48 48 wp_add_dashboard_widget( 'dashboard_php_nag', __( 'PHP Update Recommended' ), 'wp_dashboard_php_nag' ); 49 if ( $check_php['is_lower_than_future_minimum'] ) { 50 wp_add_dashboard_widget( 'dashboard_php_nag', __( 'PHP Update Required' ), 'wp_dashboard_php_nag' ); 51 } else { 52 wp_add_dashboard_widget( 'dashboard_php_nag', __( 'PHP Update Recommended' ), 'wp_dashboard_php_nag' ); 53 } 54 } 49 55 } 50 56 51 57 // Site Health. … … 1825 1831 } 1826 1832 1827 1833 if ( isset( $response['is_secure'] ) && ! $response['is_secure'] ) { 1828 $msg = sprintf( 1834 // The `is_secure` array key name doesn't actually imply this is a secure version of PHP. It only means it receives security updates. 1835 1836 if ( $response['is_lower_than_future_minimum'] ) { 1837 $message = sprintf( 1838 /* translators: %s: The server PHP version. */ 1839 __( 'Your site is running on an outdated version of PHP (%s), which does not receive security updates and soon will not be supported by WordPress. Ensure that PHP is updated on your server as soon as possible. Otherwise you will not be able to upgrade WordPress.' ), 1840 PHP_VERSION 1841 ); 1842 } else { 1843 $message = sprintf( 1844 /* translators: %s: The server PHP version. */ 1845 __( 'Your site is running on an outdated version of PHP (%s), which does not receive security updates. It should be updated.' ), 1846 PHP_VERSION 1847 ); 1848 } 1849 } elseif ( $response['is_lower_than_future_minimum'] ) { 1850 $message = sprintf( 1829 1851 /* translators: %s: The server PHP version. */ 1830 __( 'Your site is running an insecure version of PHP (%s), which should be updated.' ),1852 __( 'Your site is running on an outdated version of PHP (%s), which soon will not be supported by WordPress. Ensure that PHP is updated on your server as soon as possible. Otherwise you will not be able to upgrade WordPress.' ), 1831 1853 PHP_VERSION 1832 1854 ); 1833 1855 } else { 1834 $m sg= sprintf(1856 $message = sprintf( 1835 1857 /* translators: %s: The server PHP version. */ 1836 __( 'Your site is running an outdated version of PHP (%s), which should be updated.' ),1858 __( 'Your site is running on an outdated version of PHP (%s), which should be updated.' ), 1837 1859 PHP_VERSION 1838 1860 ); 1839 1861 } 1840 1862 ?> 1841 <p ><?php echo $msg; ?></p>1863 <p class="bigger-bolder-text"><?php echo $message; ?></p> 1842 1864 1843 < h3><?php _e( 'What is PHP and how does it affect my site?' ); ?></h3>1865 <p><?php _e( 'What is PHP and how does it affect my site?' ); ?></p> 1844 1866 <p> 1867 <?php _e( 'PHP is one of the programming languages used to build WordPress. Newer versions of PHP receive regular security updates and may increase your site’s performance.' ); ?> 1845 1868 <?php 1846 printf( 1847 /* translators: %s: The minimum recommended PHP version. */ 1848 __( 'PHP is the programming language used to build and maintain WordPress. Newer versions of PHP are created with increased performance in mind, so you may see a positive effect on your site’s performance. The minimum recommended version of PHP is %s.' ), 1849 $response ? $response['recommended_version'] : '' 1850 ); 1869 if ( ! empty( $response['recommended_version'] ) ) { 1870 printf( 1871 /* translators: %s: The minimum recommended PHP version. */ 1872 __( 'The minimum recommended version of PHP is %s.' ), 1873 $response['recommended_version'] 1874 ); 1875 } 1851 1876 ?> 1852 1877 </p> 1853 1878 … … 1879 1904 function dashboard_php_nag_class( $classes ) { 1880 1905 $response = wp_check_php_version(); 1881 1906 1882 if ( $response && isset( $response['is_secure'] ) && ! $response['is_secure']) {1883 $classes[] = 'php-insecure';1907 if ( ! $response ) { 1908 return $classes; 1884 1909 } 1885 1910 1911 if ( isset( $response['is_secure'] ) && ! $response['is_secure'] ) { 1912 $classes[] = 'php-no-security-updates'; 1913 } elseif ( $response['is_lower_than_future_minimum'] ) { 1914 $classes[] = 'php-version-lower-than-future-minimum'; 1915 } 1916 1886 1917 return $classes; 1887 1918 } 1888 1919 -
src/wp-admin/includes/misc.php
1585 1585 * 'recommended_version' - string - The PHP version recommended by WordPress. 1586 1586 * 'is_supported' - boolean - Whether the PHP version is actively supported. 1587 1587 * 'is_secure' - boolean - Whether the PHP version receives security updates. 1588 * 'is_acceptable' - boolean - Whether the PHP version is still acceptable for WordPress. 1588 * 'is_acceptable' - boolean - Whether the PHP version is still acceptable or warnings 1589 * should be shown and an update recommended. 1589 1590 */ 1590 1591 $response = json_decode( wp_remote_retrieve_body( $response ), true ); 1591 1592 … … 1613 1614 $response['is_acceptable'] = (bool) apply_filters( 'wp_is_php_version_acceptable', true, $version ); 1614 1615 } 1615 1616 1617 $response['is_lower_than_future_minimum'] = false; 1618 1619 // The minimum supported PHP version will be updated to 7.2. Check if the current version is lower. 1620 if ( version_compare( $version, '7.2', '<' ) ) { 1621 $response['is_lower_than_future_minimum'] = true; 1622 1623 // Force showing of warnings. 1624 $response['is_acceptable'] = false; 1625 } 1626 1616 1627 return $response; 1617 1628 }