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

trunk/wp-includes/nav-menu-template.php

@@ -359 +359 @@
         } elseif ( 'custom' == $menu_item->object ) {
             $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
-            $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_root_relative_current;
+            $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
             $raw_item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
             $item_url = untrailingslashit( $raw_item_url );