Changeset 12964 for trunk/wp-includes/link-template.php

Timestamp:

02/05/2010 12:45:21 PM (17 years ago)

Author:

dd32

Message:

Simplify ​https:// conversion in plugins_url()/content_url() functions

File:

• trunk/wp-includes/link-template.php (modified) (3 diffs)

trunk/wp-includes/link-template.php

@@ -1839 +1839 @@
 */
 function content_url($path = '') {
-        $scheme = ( is_ssl() ? 'https' : 'http' );
         $url = WP_CONTENT_URL;
-        if ( 0 === strpos($url, 'http') ) {
-                if ( is_ssl() )
-                        $url = str_replace( 'http://', "{$scheme}://", $url );
-        }
+        if ( 0 === strpos($url, 'http') && is_ssl() )
+                $url = str_replace( 'http://', 'https://', $url );
 
         if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
@@ -1864 +1861 @@
 */
 function plugins_url($path = '', $plugin = '') {
-        $scheme = ( is_ssl() ? 'https' : 'http' );
 
         $mu_plugin_dir = WPMU_PLUGIN_DIR;
@@ -1878 +1874 @@
 
         if ( 0 === strpos($url, 'http') && is_ssl() )
-                $url = str_replace( 'http://', "{$scheme}://", $url );
+                $url = str_replace( 'http://', 'https://', $url );
 
         if ( !empty($plugin) && is_string($plugin) ) {