Changeset 21664 for trunk/wp-includes/ms-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/ms-functions.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -1876 +1876 @@
 
 /**
- * Formats an String URL to use HTTPS if HTTP is found.
+ * Formats a URL to use https.
+ * 
  * Useful as a filter.
  *
  * @since 2.8.5
- **/
+ *
+ * @param string URL
+ * @return string URL with https as the scheme
+ */
 function filter_SSL( $url ) {
-    if ( !is_string( $url ) )
-        return get_bloginfo( 'url' ); //return home blog url with proper scheme
-
-    $arrURL = parse_url( $url );
-
-    if ( force_ssl_content() && is_ssl() ) {
-        if ( 'http' === $arrURL['scheme'] )
-            $url = str_replace( $arrURL['scheme'], 'https', $url );
-    }
+    if ( ! is_string( $url ) )
+        return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+
+    if ( force_ssl_content() && is_ssl() )
+        $url = set_url_scheme( $url, 'https' );
 
     return $url;