Changes from trunk/wp-includes/nav-menu.php at r15788 to branches/3.0/wp-includes/nav-menu.php at r15466

File:

• branches/3.0/wp-includes/nav-menu.php (modified) (2 diffs)

branches/3.0/wp-includes/nav-menu.php

@@ -404 +404 @@
  * @since 3.0.0
  *
- * @param array $args Array of arguments passed on to get_terms().
+ * @param $args array Array of arguments passed on to get_terms().
  * @return array menu objects
  */
@@ -654 +654 @@
             'post_status' => 'any',
             'post_type' => 'nav_menu_item',
-            'posts_per_page' => -1,
+            'showposts' => -1,
         )
     );