Changeset 49904
- Timestamp:
- 12/23/2020 07:11:20 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/class-wp-site-health.php
r49650 r49904 1494 1494 * 1495 1495 * @since 5.2.0 1496 * @since 5.7.0 Updated to rely on {@see wp_is_using_https()} and {@see wp_is_https_supported()}. 1496 1497 * 1497 1498 * @return array The test results. … … 1499 1500 public function get_test_https_status() { 1500 1501 $result = array( 1501 'label' => __( 'Your website is using an active HTTPS connection .' ),1502 'label' => __( 'Your website is using an active HTTPS connection' ), 1502 1503 'status' => 'good', 1503 1504 'badge' => array( … … 1520 1521 ); 1521 1522 1522 if ( is_ssl() ) { 1523 $wp_url = get_bloginfo( 'wpurl' ); 1524 $site_url = get_bloginfo( 'url' ); 1525 1526 if ( 'https' !== substr( $wp_url, 0, 5 ) || 'https' !== substr( $site_url, 0, 5 ) ) { 1527 $result['status'] = 'recommended'; 1528 1529 $result['label'] = __( 'Only parts of your site are using HTTPS' ); 1530 1523 if ( ! wp_is_using_https() ) { 1524 $result['status'] = 'critical'; 1525 $result['label'] = __( 'Your website does not use HTTPS' ); 1526 1527 if ( is_ssl() ) { 1531 1528 $result['description'] = sprintf( 1532 1529 '<p>%s</p>', … … 1537 1534 ) 1538 1535 ); 1539 1540 $result['actions'] .= sprintf( 1536 } else { 1537 $result['description'] = sprintf( 1538 '<p>%s</p>', 1539 sprintf( 1540 /* translators: %s: URL to General Settings screen. */ 1541 __( 'Your <a href="%s">WordPress Address</a> is not set up to use HTTPS.' ), 1542 esc_url( admin_url( 'options-general.php' ) ) 1543 ) 1544 ); 1545 } 1546 1547 if ( wp_is_https_supported() ) { 1548 $result['description'] .= sprintf( 1549 '<p>%s</p>', 1550 __( 'HTTPS is already supported for your website.' ) 1551 ); 1552 1553 $result['actions'] = sprintf( 1541 1554 '<p><a href="%s">%s</a></p>', 1542 1555 esc_url( admin_url( 'options-general.php' ) ), 1543 1556 __( 'Update your site addresses' ) 1544 1557 ); 1545 } 1546 } else { 1547 $result['status'] = 'recommended'; 1548 1549 $result['label'] = __( 'Your site does not use HTTPS' ); 1558 } else { 1559 $result['description'] .= sprintf( 1560 '<p>%s</p>', 1561 __( 'Talk to your web host about supporting HTTPS for your website.' ) 1562 ); 1563 } 1550 1564 } 1551 1565 -
trunk/src/wp-includes/default-filters.php
r49226 r49904 337 337 add_action( 'init', 'wp_cron' ); 338 338 } 339 340 // HTTPS detection. 341 add_action( 'init', 'wp_schedule_https_detection' ); 342 add_action( 'wp_https_detection', 'wp_update_https_detection_errors' ); 343 add_filter( 'cron_request', 'wp_cron_conditionally_prevent_sslverify', 9999 ); 339 344 340 345 // 2 Actions 2 Furious. -
trunk/src/wp-settings.php
r49566 r49904 172 172 require ABSPATH . WPINC . '/class-wp-theme.php'; 173 173 require ABSPATH . WPINC . '/template.php'; 174 require ABSPATH . WPINC . '/https-detection.php'; 174 175 require ABSPATH . WPINC . '/class-wp-user-request.php'; 175 176 require ABSPATH . WPINC . '/user.php';
Note: See TracChangeset
for help on using the changeset viewer.