Wordpress 3.1.1

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

diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 0d6dd322426a2034b117b57a7bbc3ee035ec8de2..e1af8f7aaecdcee48a84b530d9112c7da110b12c 100644 (file)
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -78,6 +78,23 @@ function register_nav_menus( $locations = array() ) {
        $_wp_registered_nav_menus = array_merge( (array) $_wp_registered_nav_menus, $locations );
 }
 
+/**
+ * Unregisters a navigation menu for a theme.
+ *
+ * @param array $location the menu location identifier
+ *
+ * @return bool True on success, false on failure.
+ */
+function unregister_nav_menu( $location ) {
+       global $_wp_registered_nav_menus;
+
+       if ( is_array( $_wp_registered_nav_menus ) && isset( $_wp_registered_nav_menus[$location] ) ) {
+               unset( $_wp_registered_nav_menus[$location] );
+               return true;
+       }
+       return false;
+}
+
 /**
  * Register a navigation menu for a theme.
  *
@@ -386,7 +403,7 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
  *
  * @since 3.0.0
  *
- * @param $args array Array of arguments passed on to get_terms().
+ * @param array $args Array of arguments passed on to get_terms().
  * @return array menu objects
  */
 function wp_get_nav_menus( $args = array() ) {
@@ -636,7 +653,7 @@ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_
                        'meta_value' => $object_id,
                        'post_status' => 'any',
                        'post_type' => 'nav_menu_item',
-                       'showposts' => -1,
+                       'posts_per_page' => -1,
                )
        );
        foreach( (array) $menu_items as $menu_item ) {