WordPress 3.4.2-scripts

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

diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index 889016627baaba2320a287b47f3fbe0034a51246..5fc73fcbbf8c65df2b8383f3d2e23aa57bcbffac 100644 (file)
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -7,7 +7,7 @@
  * @since 3.0.0
  * @uses Walker_Nav_Menu
  */
  * @since 3.0.0
  * @uses Walker_Nav_Menu
  */

-class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
+class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {

        /**
         * @see Walker_Nav_Menu::start_lvl()
         * @since 3.0.0
        /**
         * @see Walker_Nav_Menu::start_lvl()
         * @since 3.0.0


@@ -88,7 +88,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
                                        <span class="item-title"><?php echo esc_html( $title ); ?></span>
                                        <span class="item-controls">
                                                <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
                                        <span class="item-title"><?php echo esc_html( $title ); ?></span>
                                        <span class="item-controls">
                                                <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>

-                                               <span class="item-order">
+                                               <span class="item-order hide-if-js">

                                                        <a href="<?php
                                                                echo wp_nonce_url(
                                                                        add_query_arg(
                                                        <a href="<?php
                                                                echo wp_nonce_url(
                                                                        add_query_arg(


@@ -115,7 +115,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
                                                                );
                                                        ?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">&#8595;</abbr></a>
                                                </span>
                                                                );
                                                        ?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">&#8595;</abbr></a>
                                                </span>

-                                               <a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php _e('Edit Menu Item'); ?>" href="<?php
+                                               <a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" href="<?php

                                                        echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
                                                ?>"><?php _e( 'Edit Menu Item' ); ?></a>
                                        </span>
                                                        echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
                                                ?>"><?php _e( 'Edit Menu Item' ); ?></a>
                                        </span>


@@ -143,13 +143,10 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
                                                <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
                                        </label>
                                </p>
                                                <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
                                        </label>
                                </p>

-                               <p class="field-link-target description description-thin">
+                               <p class="field-link-target description">

                                        <label for="edit-menu-item-target-<?php echo $item_id; ?>">
                                        <label for="edit-menu-item-target-<?php echo $item_id; ?>">

-                                               <?php _e( 'Link Target' ); ?><br />
-                                               <select id="edit-menu-item-target-<?php echo $item_id; ?>" class="widefat edit-menu-item-target" name="menu-item-target[<?php echo $item_id; ?>]">
-                                                       <option value="" <?php selected( $item->target, ''); ?>><?php _e('Same window or tab'); ?></option>
-                                                       <option value="_blank" <?php selected( $item->target, '_blank'); ?>><?php _e('New window or tab'); ?></option>
-                                               </select>
+                                               <input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
+                                               <?php _e( 'Open link in a new window/tab' ); ?>

                                        </label>
                                </p>
                                <p class="field-css-classes description description-thin">
                                        </label>
                                </p>
                                <p class="field-css-classes description description-thin">


@@ -212,7 +209,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
  * @since 3.0.0
  * @uses Walker_Nav_Menu
  */
  * @since 3.0.0
  * @uses Walker_Nav_Menu
  */

-class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu  {
+class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {

        function __construct( $fields = false ) {
                if ( $fields ) {
                        $this->db_fields = $fields;
        function __construct( $fields = false ) {
                if ( $fields ) {
                        $this->db_fields = $fields;


@@ -327,7 +324,6 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 
                }
 
 
                }
 

-

        } elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
                if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
                        query_posts(array(
        } elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
                if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
                        query_posts(array(


@@ -340,7 +336,8 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
                        while ( have_posts() ) {
                                the_post();
                                if ( 'markup' == $response_format ) {
                        while ( have_posts() ) {
                                the_post();
                                if ( 'markup' == $response_format ) {

-                                       echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( get_the_ID() ) ) ), 0, (object) $args );
+                                       $var_by_ref = get_the_ID();
+                                       echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );

                                } elseif ( 'json' == $response_format ) {
                                        echo json_encode(
                                                array(
                                } elseif ( 'json' == $response_format ) {
                                        echo json_encode(
                                                array(


@@ -694,7 +691,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                        }
                        ?>
                        <p class="quick-search-wrap">
                        }
                        ?>
                        <p class="quick-search-wrap">

-                               <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; ?>" />
+                               <input type="search" 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, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
                        </p>
                                <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, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
                        </p>


@@ -713,7 +710,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                        </ul>
                </div><!-- /.tabs-panel -->
 
                        </ul>
                </div><!-- /.tabs-panel -->
 

-

                <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
                        echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
                ?>">
                <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
                        echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
                ?>">


@@ -769,7 +765,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
                        <?php endif; ?>
                </div><!-- /.tabs-panel -->
 
                        <?php endif; ?>
                </div><!-- /.tabs-panel -->
 

-

                <p class="button-controls">
                        <span class="list-controls">
                                <a href="<?php
                <p class="button-controls">
                        <span class="list-controls">
                                <a href="<?php


@@ -816,7 +811,6 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
                'hide_empty' => false,
                'hierarchical' => 1,
                'include' => '',
                'hide_empty' => false,
                'hierarchical' => 1,
                'include' => '',

-               'include_last_update_time' => false,

                'number' => $per_page,
                'offset' => $offset,
                'order' => 'ASC',
                'number' => $per_page,
                'offset' => $offset,
                'order' => 'ASC',


@@ -928,7 +922,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
                        }
                        ?>
                        <p class="quick-search-wrap">
                        }
                        ?>
                        <p class="quick-search-wrap">

-                               <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; ?>" />
+                               <input type="search" 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, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
                        </p>
                                <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, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
                        </p>


@@ -992,7 +986,7 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
                                (
                                        ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
                                        in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
                                (
                                        ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
                                        in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default

-                                       ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||  // or it's not a custom menu item (but not the custom home page)
+                                       ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)

                                        ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
                                )
                        ) {
                                        ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
                                )
                        ) {


@@ -1127,7 +1121,6 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
                return $menu;
        }
 
                return $menu;
        }
 

-

 }
 
 /**
 }
 
 /**


@@ -1167,5 +1160,3 @@ function _wp_delete_orphaned_draft_menu_items() {
 }
 
 add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 }
 
 add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');

-
-?>