Changeset 15254 for trunk/wp-admin/includes/nav-menu.php

Timestamp:

06/14/2010 07:52:30 PM (15 years ago)

Author:

nacin

Message:

Revert [15219], [15250], some of [15249] for 3.0, revisit in 3.0.1. see #13822.

File:

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

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

@@ -72 +72 @@
 
         if ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
-            $original_status = get_post_status_object( $original_object->post_status );
-            $classes[] = "draft post-status-$original_object->post_status";
-            /* translators: 1: title of menu item in draft status, 2: actual post status. */
-            $title = sprintf( __('%1$s (%2$s)'), $item->title, $original_status->label );
-        } elseif ( isset( $item->post_status ) && 'pending' == $item->post_status ) {
-            $classes[] = 'unsaved';
-            /* translators: %s: title of menu item in pending status */
-            $title = sprintf( __('%s (Unsaved)'), $item->title );
+            $classes[] = 'pending';
+            /* translators: %s: title of menu item in draft status */
+            $title = sprintf( __('%s (Pending)'), $item->title );
         }
 
@@ -178 +173 @@
                     <?php if( 'custom' != $item->type ) : ?>
                         <p class="link-to-original">
-                            <?php
-                            $post_status = get_post_status( $item->object_id );
-                            if( 'publish' == $post_status ) {
-                                printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>', '' );
-                            } else {
-                                $original_url = $item->url;
-                                if( 'trash' == $post_status ) {
-                                    $original_url = add_query_arg(
-                                        array(
-                                            'post_status' => 'trash',
-                                            'post_type' => $item->object,
-                                        ),
-                                        admin_url( 'edit.php' )
-                                    );
-                                }
-                                $post_status_obj = get_post_status_object( $post_status );
-                                /* translators: 1: title, 2: post status. */
-                                printf( __('Original: %1$s (%2$s)'), '<a href="' . esc_attr( $original_url ) . '">' . esc_html( $original_title ) . '</a>',
-                                $post_status_obj->label );
-                            }
-                            ?>
+                            <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
                         </p>
                     <?php endif; ?>
@@ -220 +195 @@
                 <input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
                 <input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
-                <input class="menu-item-data-status" type="hidden" name="menu-item-status[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_status ); ?>" />
                 <input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
             </div><!-- .menu-item-settings-->
@@ -974 +948 @@
  * @since 3.0.0
  *
- * @param int $menu_id The menu ID for which to save this item. $menu_id of 0 makes a pending, orphaned menu item.
+ * @param int $menu_id The menu ID for which to save this item. $menu_id of 0 makes a draft, orphaned menu item.
  * @param array $menu_data The unsanitized posted menu item data.
  * @return array The database IDs of the items saved
@@ -1106 +1080 @@
         $some_pending_menu_items = false;
         foreach( (array) $menu_items as $menu_item ) {
-            if ( isset( $menu_item->post_status ) && 'pending' == $menu_item->post_status )
+            if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
                 $some_pending_menu_items = true;
         }
 
         if ( $some_pending_menu_items )
-            $result .= '<div class="updated inline"><p>' . __('Click Save Menu to make unsaved menu items public.') . '</p></div>';
+            $result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
 
         $result .= '<ul class="menu" id="menu-to-edit"> ';
@@ -1144 +1118 @@
 
 /**
- * Deletes orphaned pending menu items
+ * Deletes orphaned draft menu items
  *
  * @access private
@@ -1150 +1124 @@
  *
  */
-function _wp_delete_orphaned_pending_menu_items() {
+function _wp_delete_orphaned_draft_menu_items() {
     global $wpdb;
     $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
 
-    // delete orphaned pending menu items
-    $menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'pending' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
+    // delete orphaned draft menu items
+    $menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
 
     foreach( (array) $menu_items_to_delete as $menu_item_id )
@@ -1161 +1135 @@
 }
 
-add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_pending_menu_items');
+add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 
 ?>