Changeset 13882

Timestamp:

03/29/2010 08:25:30 PM (16 years ago)

Author:

ryan

Message:

Don't stomp scheme arg. see #12736

File:

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

trunk/wp-includes/link-template.php

@@ -1832 +1832 @@
 function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
     $orig_scheme = $scheme;
-    $scheme      = is_ssl() && !is_admin() ? 'https' : 'http';
+
+    if ( !in_array($scheme, array('http', 'https')) )
+        $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
 
     if ( empty($blog_id) || !is_multisite() )
@@ -2075 +2077 @@
     global $current_site;
     $orig_scheme = $scheme;
-    $scheme      = is_ssl() && !is_admin() ? 'https' : 'http';
+
+    if ( !in_array($scheme, array('http', 'https')) )
+        $scheme = is_ssl() && !is_admin() ? 'https' : 'http';
 
     $url = 'http://' . $current_site->domain . $current_site->path;