Changeset 25957
- Timestamp:
- 10/27/2013 09:09:49 PM (11 years ago)
- Location:
- branches/3.7
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.7
-
branches/3.7/src
- Property svn:mergeinfo changed
/trunk/src merged: 25956
- Property svn:mergeinfo changed
-
branches/3.7/src/wp-admin/about.php
r25931 r25957 70 70 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; 71 71 $updater = new WP_Automatic_Updater; 72 $can_auto_update = wp_http_supports( 'ssl') && $updater->should_update( 'core', $future_minor_update, ABSPATH );72 $can_auto_update = wp_http_supports( array( 'ssl' ) ) && $updater->should_update( 'core', $future_minor_update, ABSPATH ); 73 73 74 74 if ( $can_auto_update ) { -
branches/3.7/src/wp-admin/includes/plugin-install.php
r25691 r25957 61 61 62 62 if ( false === $res ) { 63 $url = 'http://api.wordpress.org/plugins/info/1.0/';64 if ( wp_http_supports( array( 'ssl' ) ) )63 $url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/'; 64 if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) 65 65 $url = set_url_scheme( $url, 'https' ); 66 66 67 $ request = wp_remote_post( $url,array(67 $args = array( 68 68 'timeout' => 15, 69 69 'body' => array( … … 71 71 'request' => serialize( $args ) 72 72 ) 73 ) ); 73 ); 74 $request = wp_remote_post( $url, $args ); 75 76 if ( $ssl && is_wp_error( $request ) ) { 77 trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); 78 $request = wp_remote_post( $http_url, $args ); 79 } 74 80 75 81 if ( is_wp_error($request) ) { -
branches/3.7/src/wp-admin/includes/theme.php
r25308 r25957 283 283 284 284 if ( ! $res ) { 285 $url = 'http://api.wordpress.org/themes/info/1.0/';286 if ( wp_http_supports( array( 'ssl' ) ) )285 $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/'; 286 if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) 287 287 $url = set_url_scheme( $url, 'https' ); 288 288 289 $ request = wp_remote_post( $url,array(289 $args = array( 290 290 'body' => array( 291 291 'action' => $action, 292 292 'request' => serialize( $args ) 293 293 ) 294 ) ); 294 ); 295 $request = wp_remote_post( $url, $args ); 296 297 if ( $ssl && is_wp_error( $request ) ) { 298 trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); 299 $request = wp_remote_post( $http_url, $args ); 300 } 295 301 296 302 if ( is_wp_error($request) ) { -
branches/3.7/src/wp-admin/includes/update.php
r25872 r25957 104 104 $return = array(); 105 105 106 $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );107 108 if ( wp_http_supports( array( 'ssl' ) ) )106 $url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' ); 107 108 if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) 109 109 $url = set_url_scheme( $url, 'https' ); 110 110 … … 114 114 115 115 $response = wp_remote_get( $url, $options ); 116 if ( $ssl && is_wp_error( $response ) ) { 117 trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); 118 $response = wp_remote_get( $http_url, $options ); 119 } 116 120 117 121 if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) -
branches/3.7/src/wp-admin/update-core.php
r25881 r25957 147 147 _e('You have the latest version of WordPress.'); 148 148 149 if ( wp_http_supports( 'ssl') ) {149 if ( wp_http_supports( array( 'ssl' ) ) ) { 150 150 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; 151 151 $upgrader = new WP_Automatic_Updater; -
branches/3.7/src/wp-includes/update.php
r25881 r25957 94 94 $post_body = array_merge( $post_body, $extra_stats ); 95 95 96 $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );97 if ( wp_http_supports( array( 'ssl' ) ) )96 $url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' ); 97 if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) 98 98 $url = set_url_scheme( $url, 'https' ); 99 99 … … 109 109 110 110 $response = wp_remote_post( $url, $options ); 111 if ( $ssl && is_wp_error( $response ) ) { 112 trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); 113 $response = wp_remote_post( $http_url, $options ); 114 } 111 115 112 116 if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) … … 247 251 ); 248 252 249 $url = 'http://api.wordpress.org/plugins/update-check/1.1/';250 if ( wp_http_supports( array( 'ssl' ) ) )253 $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/'; 254 if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) 251 255 $url = set_url_scheme( $url, 'https' ); 252 256 253 257 $raw_response = wp_remote_post( $url, $options ); 258 if ( $ssl && is_wp_error( $raw_response ) ) { 259 trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); 260 $raw_response = wp_remote_post( $http_url, $options ); 261 } 254 262 255 263 if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) … … 383 391 ); 384 392 385 $url = 'http://api.wordpress.org/themes/update-check/1.1/';386 if ( wp_http_supports( array( 'ssl' ) ) )393 $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/'; 394 if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) 387 395 $url = set_url_scheme( $url, 'https' ); 388 396 389 397 $raw_response = wp_remote_post( $url, $options ); 398 if ( $ssl && is_wp_error( $raw_response ) ) { 399 trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE ); 400 $raw_response = wp_remote_post( $http_url, $options ); 401 } 390 402 391 403 if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
Note: See TracChangeset
for help on using the changeset viewer.