Changeset 21664 for trunk/wp-includes/link-template.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/link-template.php (modified) (2 diffs)

trunk/wp-includes/link-template.php

@@ -2050 +2050 @@
 */
 function content_url($path = '') {
-    $url = WP_CONTENT_URL;
-    if ( 0 === strpos($url, 'http') && is_ssl() )
-        $url = str_replace( 'http://', 'https://', $url );
+    $url = set_url_scheme( WP_CONTENT_URL );
 
     if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
@@ -2084 +2082 @@
         $url = WP_PLUGIN_URL;
 
-    if ( 0 === strpos($url, 'http') && is_ssl() )
-        $url = str_replace( 'http://', 'https://', $url );
+    
+    $url = set_url_scheme( $url );
 
     if ( !empty($plugin) && is_string($plugin) ) {