Changeset 33775

Timestamp:

08/28/2015 03:30:55 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Avoid PHP notices in redirect_canonical() and _wp_menu_item_classes_by_context() if $_SERVER['HTTP_HOST'] is not set.

fixes #32229.

Location:

trunk/src/wp-includes

Files:

• canonical.php (modified) (1 diff)
• nav-menu-template.php (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -60 +60 @@
     }
 
-    if ( !$requested_url ) {
+    if ( ! $requested_url && isset( $_SERVER['HTTP_HOST'] ) ) {
         // build the URL in the address bar
         $requested_url  = is_ssl() ? 'https://' : 'http://';

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

@@ -554 +554 @@
 
         // if the menu item corresponds to the currently-requested URL
-        } elseif ( 'custom' == $menu_item->object ) {
+        } elseif ( 'custom' == $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) {
             $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
             $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );