Changes in trunk/wp-admin/includes/nav-menu.php [17143:18277]

File:

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

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

@@ -68 +68 @@
         $title = $item->title;
 
-        if ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
+        if ( ! empty( $item->_invalid ) ) {
+            $classes[] = 'menu-item-invalid';
+            /* translators: %s: title of menu item which is invalid */
+            $title = sprintf( __( '%s (Invalid)' ), $item->title );
+        } elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
             $classes[] = 'pending';
             /* translators: %s: title of menu item in draft status */
@@ -183 +187 @@
                         ),
                         'delete-menu_item_' . $item_id
-                    ); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep"> | </span> <a class="item-cancel submitcancel" id="cancel-<?php echo $item_id; ?>" href="<?php echo add_query_arg( array('edit-menu-item' => $item_id, 'cancel' => time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) );
+                    ); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep"> | </span> <a class="item-cancel submitcancel" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array('edit-menu-item' => $item_id, 'cancel' => time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) ) );
                         ?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
                 </div>
@@ -208 +212 @@
  */
 class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu  {
+    function __construct( $fields = false ) {
+        if ( $fields ) {
+            $this->db_fields = $fields;
+        }
+    }
+
+    function start_lvl( &$output, $depth ) {
+        $indent = str_repeat( "\t", $depth );
+        $output .= "\n$indent<ul class='children'>\n";
+    }
+
+    function end_lvl( &$output, $depth ) {
+        $indent = str_repeat( "\t", $depth );
+        $output .= "\n$indent</ul>";
+    }
 
     /**
@@ -320 +339 @@
                 the_post();
                 if ( 'markup' == $response_format ) {
-                    echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref = get_the_ID() ) ) ), 0, (object) $args );
+                    echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( get_the_ID() ) ) ), 0, (object) $args );
                 } elseif ( 'json' == $response_format ) {
                     echo json_encode(
@@ -615 +634 @@
         $error = '<li id="error">'. $post_type['args']->labels->not_found .'</li>';
 
-    $walker = new Walker_Nav_Menu_Checklist;
+    $db_fields = false;
+    if ( is_post_type_hierarchical( $post_type_name ) ) {
+        $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+    }
+
+    $walker = new Walker_Nav_Menu_Checklist( $db_fields );
 
     $current_tab = 'most-recent';
@@ -671 +695 @@
                 <input type="text" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
                 <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false ); ?>
+                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
             </p>
 
@@ -717 +741 @@
                             'post_content' => '',
                             'post_excerpt' => '',
+                            'post_parent' => '',
                             'post_title' => _x('Home', 'nav menu home label'),
                             'post_type' => 'nav_menu_item',
@@ -725 +750 @@
                 }
 
+                $posts = apply_filters( 'nav_menu_items_'.$post_type_name, $posts, $args, $post_type );
                 $checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
 
@@ -822 +848 @@
     ));
 
-    $walker = new Walker_Nav_Menu_Checklist;
+    $db_fields = false;
+    if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
+        $db_fields = array( 'parent' => 'parent', 'id' => 'term_id' );
+    }
+
+    $walker = new Walker_Nav_Menu_Checklist( $db_fields );
 
     $current_tab = 'most-used';
@@ -898 +929 @@
                 <input type="text" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
                 <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false ); ?>
+                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
             </p>
 
@@ -1073 +1104 @@
             return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named <strong>%s</strong> does not exist.'), $walker_class_name ) );
 
-        $some_pending_menu_items = false;
+        $some_pending_menu_items = $some_invalid_menu_items = false;
         foreach( (array) $menu_items as $menu_item ) {
             if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
                 $some_pending_menu_items = true;
+            if ( ! empty( $menu_item->_invalid ) )
+                $some_invalid_menu_items = true;
         }
 
         if ( $some_pending_menu_items )
             $result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+
+        if ( $some_invalid_menu_items )
+            $result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
 
         $result .= '<ul class="menu" id="menu-to-edit"> ';