Changeset 15219 for trunk/wp-includes/nav-menu.php

Timestamp:

06/11/2010 03:34:32 PM (14 years ago)

Author:

wpmuguru

Message:

hide unpublished items on frontend nav menus, props filosofo, fixes #13822

File:

• trunk/wp-includes/nav-menu.php (modified) (6 diffs)

trunk/wp-includes/nav-menu.php

@@ -245 +245 @@
  * @since 3.0.0
  *
- * @param int $menu_id The ID of the menu. Required. If "0", makes the menu item a draft orphan.
+ * @param int $menu_id The ID of the menu. Required. If "0", makes the menu item a pending orphan.
  * @param int $menu_item_db_id The ID of the menu item. If "0", creates a new menu item.
  * @param array $menu_item_data The menu item's data.
@@ -263 +263 @@
         return $menu;
 
-    $menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
+    $menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'draft,pending,publish' ) );
 
     $count = count( $menu_items );
@@ -340 +340 @@
         $post['tax_input'] = array( 'nav_menu' => array( intval( $menu->term_id ) ) );
 
-    // New menu item. Default is draft status
+    // New menu item. Default is pending status
     if ( 0 == $menu_item_db_id ) {
         $post['ID'] = 0;
-        $post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
+        $post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'pending';
         $menu_item_db_id = wp_insert_post( $post );
 
@@ -671 +671 @@
     foreach( (array) $menu_item_ids as $menu_item_id ) {
         $menu_item = get_post( $menu_item_id, ARRAY_A );
-        $menu_item['post_status'] = 'draft';
+        $menu_item['post_status'] = 'pending';
         wp_insert_post($menu_item);
     }
@@ -736 +736 @@
 
 /**
- * Automatically add newly published page objects to menus with that as an option.
+ * Modify a navigational menu upon post object status change, if appropos.
  *
  * @since 3.0.0
@@ -746 +746 @@
  * @return void
  */
-function _wp_auto_add_pages_to_menu( $new_status, $old_status, $post ) {
-    if ( 'publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type )
-        return;
-    if ( ! empty( $post->post_parent ) )
-        return;
-    $auto_add = get_option( 'nav_menu_options' );
-    if ( empty( $auto_add ) || ! is_array( $auto_add ) || ! isset( $auto_add['auto_add'] ) )
-        return;
-    $auto_add = $auto_add['auto_add'];
-    if ( empty( $auto_add ) || ! is_array( $auto_add ) )
-        return;
-
-    $args = array(
-        'menu-item-object-id' => $post->ID,
-        'menu-item-object' => $post->post_type,
-        'menu-item-type' => 'post_type',
-        'menu-item-status' => 'publish',
-    );
-
-    foreach ( $auto_add as $menu_id ) {
-        $items = wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-        if ( ! is_array( $items ) )
-            continue;
-        foreach ( $items as $item ) {
-            if ( $post->ID == $item->object_id )
-                continue 2;
-        }
-        wp_update_nav_menu_item( $menu_id, 0, $args );
+function _wp_menu_changing_status_observer( $new_status, $old_status, $post ) {
+    // append new top-level page objects to a menu for which that option is selected
+    if ( 
+        'publish' == $new_status && 
+        'publish' != $old_status && 
+        'page' == $post->post_type && 
+        empty( $post->post_parent )
+    ) {
+        $auto_add = get_option( 'nav_menu_options' );
+        if ( 
+            isset( $auto_add['auto_add'] ) &&
+            is_array( $auto_add['auto_add'] ) 
+        ) {
+            $args = array(
+                'menu-item-object-id' => $post->ID,
+                'menu-item-object' => $post->post_type,
+                'menu-item-type' => 'post_type',
+                'menu-item-status' => 'publish',
+            );
+
+            foreach ( $auto_add['auto_add'] as $menu_id ) {
+                $items = wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'draft,pending,publish' ) );
+                if ( ! is_array( $items ) )
+                    continue;
+                foreach ( $items as $item ) {
+                    if ( $post->ID == $item->object_id )
+                        continue 2;
+                }
+                wp_update_nav_menu_item( $menu_id, 0, $args );
+            }
+        }
+    } 
+    
+    // give menu items draft status if their associated post objects change from "publish" to "draft", or vice versa (draft item being re-published)
+    if ( 
+        ! empty( $post->ID ) &&
+        ( 
+            ( 'publish' == $old_status && 'draft' == $new_status ) ||
+            ( 'draft' == $old_status && 'publish' == $new_status ) 
+        )
+    ) {
+        $menu_items = get_posts(array(
+            'meta_key' => '_menu_item_object_id',
+            'meta_value' => $post->ID,
+            'post_status' => 'any',
+            'post_type' => 'nav_menu_item',
+        ));
+
+        foreach( (array) $menu_items as $menu_item ) {
+            if ( ! empty( $menu_item->ID ) ) {
+                $properties = get_object_vars( $menu_item );
+                $properties['post_status'] = $new_status;
+
+                wp_insert_post( $properties );
+            }
+        }
     }
 }