Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-05 07:58:35 +01:00
Code Issues Projects Releases Wiki Activity

Use is_ssl() in place of manual SERVER['HTTPS'] == 'on' checks. fixes #11885

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-02-26 06:21:47 +00:00
parent dbdc7a9e83
commit a8e56e49ec
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-app.php
View File

@ -224,10 +224,7 @@ class AtomServer {
function AtomServer() { function AtomServer() {
$this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME'])); $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
$this->app_base = get_bloginfo('url') . '/' . $this->script_name . '/'; $this->app_base = home_url( $this->script_name . '/' );
if ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) {
$this->app_base = preg_replace( '/^http:\/\//', 'https://', $this->app_base );
}
$this->selectors = array( $this->selectors = array(
'@/service$@' => '@/service$@' =>

2
wp-includes/canonical.php
View File

@ -42,7 +42,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
if ( !$requested_url ) { if ( !$requested_url ) {
// build the URL in the address bar // build the URL in the address bar
$requested_url = ( !empty($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; $requested_url = is_ssl() ? 'https://' : 'http://';
$requested_url .= $_SERVER['HTTP_HOST']; $requested_url .= $_SERVER['HTTP_HOST'];
$requested_url .= $_SERVER['REQUEST_URI']; $requested_url .= $_SERVER['REQUEST_URI'];
} }

2
wp-includes/functions.php
View File

@ -3337,7 +3337,7 @@ function wp_guess_url() {
if ( defined('WP_SITEURL') && '' != WP_SITEURL ) { if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
$url = WP_SITEURL; $url = WP_SITEURL;
} else { } else {
$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; $schema = is_ssl() ? 'https://' : 'http://';
$url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); $url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
} }
return $url; return $url;

2
wp-login.php
View File

@ -339,7 +339,7 @@ if ( defined('RELOCATE') ) { // Move flag is set
if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] ); $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; $schema = is_ssl() ? 'https://' : 'http://';
if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') ) if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') )
update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
} }