Changeset 15075

Timestamp:

05/31/2010 02:54:50 PM (15 years ago)

Author:

nacin

Message:

Remove vestigial 'context' code for wp_nav_menu. This was used when we used to use the same function as a theme template tag and admin template function (now we don't.) fixes #13656.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-includes/nav-menu-template.php (modified) (5 diffs)

trunk/wp-admin/admin-ajax.php

@@ -834 +834 @@
             'after' => '',
             'before' => '',
-            'context' => 'backend',
             'link_after' => '',
             'link_before' => '',

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

@@ -199 +199 @@
  * depth - how many levels of the hierarchy are to be included.  0 means all.  Defaults to 0.
  * walker - allows a custom walker to be specified.
- * context - the context the menu is used in.
  * theme_location - the location in the theme to be used.  Must be registered with register_nav_menu() in order to be selectable by the user.
  *
@@ -210 +209 @@
     $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'container_id' => '', 'menu_class' => 'menu', 
     'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '',
-    'depth' => 0, 'walker' => '', 'context' => 'frontend', 'theme_location' => '' );
+    'depth' => 0, 'walker' => '', 'theme_location' => '' );
 
     $args = wp_parse_args( $args, $defaults );
@@ -238 +237 @@
         $menu_items = wp_get_nav_menu_items( $menu->term_id );
 
-    // If no menu was found or if the menu has no items, call the fallback_cb
-    if ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) ) ) {
-        if ( 'frontend' == $args->context && ( function_exists($args->fallback_cb) || is_callable( $args->fallback_cb ) ) ) {
+    // If no menu was found or if the menu has no items, call the fallback_cb if it exists
+    if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) ) )
+        && ( function_exists($args->fallback_cb) || is_callable( $args->fallback_cb ) ) )
             return call_user_func( $args->fallback_cb, (array) $args );
-        }
-    }
 
     // If no fallback function was specified and the menu doesn't exists, bail.
@@ -259 +256 @@
 
     // Set up the $menu_item variables
-    if ( 'frontend' == $args->context )
-        _wp_menu_item_classes_by_context( $menu_items );
+    _wp_menu_item_classes_by_context( $menu_items );
 
     $sorted_menu_items = array();
@@ -310 +306 @@
 
 /**
- * Add the class property classes for the current frontend context, if applicable.
+ * Add the class property classes for the current context, if applicable.
  *
  * @access private