WordPress 4.3

[autoinstalls/wordpress.git] / wp-includes / nav-menu-template.php

diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 5feac802f825beb803a08088333fdc1e4f755f24..bcc9b6325ca06d1a537cee65753908a53959d360 100644 (file)
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -195,6 +195,8 @@ class Walker_Nav_Menu extends Walker {
  *
  * @since 3.0.0
  *
  *
  * @since 3.0.0
  *

+ * @staticvar array $menu_id_slugs
+ *

  * @param array $args {
  *     Optional. Array of nav menu arguments.
  *
  * @param array $args {
  *     Optional. Array of nav menu arguments.
  *


@@ -219,7 +221,7 @@ class Walker_Nav_Menu extends Walker {
  *     @type string        $items_wrap      How the list items should be wrapped. Default is a ul with an id and class.
  *                                          Uses printf() format with numbered placeholders.
  * }
  *     @type string        $items_wrap      How the list items should be wrapped. Default is a ul with an id and class.
  *                                          Uses printf() format with numbered placeholders.
  * }

- * @return mixed Menu output if $echo is false, false if there are no items or no menu was found.
+ * @return object|false|void Menu output if $echo is false, false if there are no items or no menu was found.

  */
 function wp_nav_menu( $args = array() ) {
        static $menu_id_slugs = array();
  */
 function wp_nav_menu( $args = array() ) {
        static $menu_id_slugs = array();


@@ -284,6 +286,10 @@ function wp_nav_menu( $args = array() ) {
                }
        }
 
                }
        }
 

+       if ( empty( $args->menu ) ) {
+               $args->menu = $menu;
+       }
+

        // If the menu exists, get its items.
        if ( $menu && ! is_wp_error($menu) && !isset($menu_items) )
                $menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
        // If the menu exists, get its items.
        if ( $menu && ! is_wp_error($menu) && !isset($menu_items) )
                $menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );


@@ -297,7 +303,7 @@ function wp_nav_menu( $args = array() ) {
         *  - Otherwise, bail.
         */
        if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )
         *  - Otherwise, bail.
         */
        if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )

-               && $args->fallback_cb && is_callable( $args->fallback_cb ) )
+               && isset( $args->fallback_cb ) && $args->fallback_cb && is_callable( $args->fallback_cb ) )

                        return call_user_func( $args->fallback_cb, (array) $args );
 
        if ( ! $menu || is_wp_error( $menu ) )
                        return call_user_func( $args->fallback_cb, (array) $args );
 
        if ( ! $menu || is_wp_error( $menu ) )


@@ -430,6 +436,9 @@ function wp_nav_menu( $args = array() ) {
  * @access private
  * @since 3.0.0
  *
  * @access private
  * @since 3.0.0
  *

+ * @global WP_Query   $wp_query
+ * @global WP_Rewrite $wp_rewrite
+ *

  * @param array $menu_items The current menu item objects to which to add the class property information.
  */
 function _wp_menu_item_classes_by_context( &$menu_items ) {
  * @param array $menu_items The current menu item objects to which to add the class property information.
  */
 function _wp_menu_item_classes_by_context( &$menu_items ) {


@@ -548,7 +557,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
                        $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
                        $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;
                        $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
                        $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 );
+                       $item_url = set_url_scheme( untrailingslashit( $raw_item_url ) );

                        $_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
 
                        if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
                        $_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
 
                        if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {


@@ -651,13 +660,17 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
  *
  * @uses Walker_Nav_Menu to create HTML list content.
  * @since 3.0.0
  *
  * @uses Walker_Nav_Menu to create HTML list content.
  * @since 3.0.0

- * @see Walker::walk() for parameters and return description.
+ *
+ * @param array  $items
+ * @param int    $depth
+ * @param object $r
+ * @return string

  */
 function walk_nav_menu_tree( $items, $depth, $r ) {
        $walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker;
        $args = array( $items, $depth, $r );
 
  */
 function walk_nav_menu_tree( $items, $depth, $r ) {
        $walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker;
        $args = array( $items, $depth, $r );
 

-       return call_user_func_array( array($walker, 'walk'), $args );
+       return call_user_func_array( array( $walker, 'walk' ), $args );

 }
 
 /**
 }
 
 /**


@@ -665,11 +678,17 @@ function walk_nav_menu_tree( $items, $depth, $r ) {
  *
  * @since 3.0.1
  * @access private
  *
  * @since 3.0.1
  * @access private

+ *
+ * @staticvar array $used_ids
+ * @param string $id
+ * @param object $item
+ * @return string

  */
 function _nav_menu_item_id_use_once( $id, $item ) {
        static $_used_ids = array();
  */
 function _nav_menu_item_id_use_once( $id, $item ) {
        static $_used_ids = array();

-       if ( in_array( $item->ID, $_used_ids ) )
+       if ( in_array( $item->ID, $_used_ids ) ) {

                return '';
                return '';

+       }

        $_used_ids[] = $item->ID;
        return $id;
 }
        $_used_ids[] = $item->ID;
        return $id;
 }