Changeset 21664 for trunk/wp-includes/functions.php

Timestamp:

08/30/2012 01:33:00 PM (12 years ago)

Author:

ryan

Message:

Use set_url_scheme(). Props johnbillion, MarcusPope. see #19037 #20759

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -2586 +2586 @@
 function url_is_accessable_via_ssl($url)
 {
-    if (in_array('curl', get_loaded_extensions())) {
-        $ssl = preg_replace( '/^http:\/\//', 'https://',  $url );
+    if ( in_array( 'curl', get_loaded_extensions() ) ) {
+        $ssl = set_url_scheme( $url, 'https' );
 
         $ch = curl_init();
@@ -2934 +2934 @@
  */
 function wp_guess_url() {
-    if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+    if ( defined('WP_SITEURL') && '' != WP_SITEURL )
         $url = WP_SITEURL;
-    } else {
-        $schema = is_ssl() ? 'https://' : 'http://';
-        $url = preg_replace('#/(wp-admin/.*|wp-login.php)#i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-    }
+    else
+        $url = set_url_scheme( preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ) );
+
     return rtrim($url, '/');
 }