Changeset 15932

Timestamp:

10/23/2010 05:13:52 PM (13 years ago)

Author:

nacin

Message:

Don't make redundant str_replace calls in link-template. props duck_.

File:

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

trunk/wp-includes/link-template.php

@@ -1958 +1958 @@
         $home = get_blog_option( $blog_id, 'home' );
 
-    $url = str_replace( 'http://', "$scheme://", $home );
+    if ( 'http' != $scheme )
+        $url = str_replace( 'http://', "$scheme://", $home );
 
     if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
@@ -2020 +2021 @@
         $url = get_blog_option( $blog_id, 'siteurl' );
 
-    $url = str_replace( 'http://', "{$scheme}://", $url );
+    if ( 'http' != $scheme )
+        $url = str_replace( 'http://', "{$scheme}://", $url );
 
     if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
@@ -2171 +2173 @@
     }
 
-    $url = 'http://' . $current_site->domain . $current_site->path;
-
-    $url = str_replace( 'http://', "{$scheme}://", $url );
+    $url = $scheme . '://' . $current_site->domain . $current_site->path;
 
     if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
@@ -2206 +2206 @@
         $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
 
-    $url = 'http://' . $current_site->domain . $current_site->path;
-
-    $url = str_replace( 'http://', "$scheme://", $url );
+    $url = $scheme . '://' . $current_site->domain . $current_site->path;
 
     if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )