WordPress 4.7

[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 cb1519c83b739255ab347c792a594fabad042b33..a6aac33053225bec3921425befed2f083e09da0b 100644 (file)
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -70,14 +70,22 @@ 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] ) ) {
-                       $search_results_query = new WP_Query( array(
-                               'no_found_rows'          => true,
-                               'update_post_meta_cache' => false,
-                               'update_post_term_cache' => false,
-                               'posts_per_page'         => 10,
-                               'post_type'              => $matches[2],
-                               's'                      => $query,
-                       ) );
+                       $post_type_obj = _wp_nav_menu_meta_box_object( get_post_type_object( $matches[2] ) );
+                       $args = array_merge(
+                               $args,
+                               array(
+                                       'no_found_rows'          => true,
+                                       'update_post_meta_cache' => false,
+                                       'update_post_term_cache' => false,
+                                       'posts_per_page'         => 10,
+                                       'post_type'              => $matches[2],
+                                       's'                      => $query,
+                               )
+                       );
+                       if ( isset( $post_type_obj->_default_query ) ) {
+                               $args = array_merge( $args, (array) $post_type_obj->_default_query );
+                       }
+                       $search_results_query = new WP_Query( $args );
                        if ( ! $search_results_query->have_posts() ) {
                                return;
                        }
@@ -279,7 +287,7 @@ function wp_nav_menu_item_link_meta_box() {
 
                <p class="button-controls wp-clearfix">
                        <span class="add-to-menu">
-                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
                                <span class="spinner"></span>
                        </span>
                </p>
@@ -350,9 +358,10 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
                        )
                ),
                'format' => '',
-               'prev_text' => __('&laquo;'),
-               'next_text' => __('&raquo;'),
-               'total' => $num_pages,
+               'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
+               'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
+               'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+               'total'   => $num_pages,
                'current' => $pagenum
        ));
 
@@ -445,7 +454,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
                                <label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
                                <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
                                <span class="spinner"></span>
-                               <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+                               <?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
                        </p>
 
                        <ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
@@ -502,7 +511,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
                                }
 
                                $post_type = get_post_type_object( $post_type_name );
-                               $archive_link = get_post_type_archive_link( $post_type_name );
+
                                if ( $post_type->has_archive ) {
                                        $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
                                        array_unshift( $posts, (object) array(
@@ -563,11 +572,11 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
                                                ),
                                                remove_query_arg( $removed_args )
                                        ));
-                               ?>#posttype-<?php echo $post_type_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
+                               ?>#posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
                        </span>
 
                        <span class="add-to-menu">
-                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
                                <span class="spinner"></span>
                        </span>
                </p>
@@ -634,9 +643,10 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
                        )
                ),
                'format' => '',
-               'prev_text' => __('&laquo;'),
-               'next_text' => __('&raquo;'),
-               'total' => $num_pages,
+               'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
+               'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
+               'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+               'total'   => $num_pages,
                'current' => $pagenum
        ));
 
@@ -734,7 +744,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
                                <label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
                                <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
                                <span class="spinner"></span>
-                               <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+                               <?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
                        </p>
 
                        <ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
@@ -761,11 +771,11 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
                                                ),
                                                remove_query_arg($removed_args)
                                        ));
-                               ?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
+                               ?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
                        </span>
 
                        <span class="add-to-menu">
-                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+                               <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
                                <span class="spinner"></span>
                        </span>
                </p>