diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wp-admin/css/forms.css | 4 | ||||
| -rw-r--r-- | src/wp-admin/css/themes.css | 4 | ||||
| -rw-r--r-- | src/wp-admin/includes/media.php | 2 | ||||
| -rw-r--r-- | src/wp-admin/media-new.php | 2 | ||||
| -rw-r--r-- | src/wp-admin/nav-menus.php | 14 | ||||
| -rw-r--r-- | src/wp-includes/class-wp-query.php | 2 | ||||
| -rw-r--r-- | src/wp-includes/embed.php | 2 | ||||
| -rw-r--r-- | src/wp-includes/option.php | 2 | ||||
| -rw-r--r-- | src/wp-includes/rewrite.php | 6 | ||||
| -rw-r--r-- | src/wp-includes/taxonomy.php | 2 |
10 files changed, 18 insertions, 22 deletions
diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css index ffe2c1711e..2802c30c69 100644 --- a/src/wp-admin/css/forms.css +++ b/src/wp-admin/css/forms.css @@ -1592,10 +1592,6 @@ table.form-table td .updated p { line-height: 0.76190476; } - .wp-upload-form input[type="submit"] { - margin-top: 10px; - } - .wp-core-ui select, .wp-admin .form-table select { min-height: 40px; diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css index bd336f7608..bd51b02385 100644 --- a/src/wp-admin/css/themes.css +++ b/src/wp-admin/css/themes.css @@ -2013,6 +2013,10 @@ body.full-overlay-active { .upload-plugin .wp-upload-form { display: block; } + + :is(.upload-theme, .upload-plugin) .wp-upload-form input[type="submit"] { + margin-top: 10px; + } } @media aural { diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php index 7d9fd638fb..22164aa65a 100644 --- a/src/wp-admin/includes/media.php +++ b/src/wp-admin/includes/media.php @@ -2285,7 +2285,7 @@ function media_upload_form( $errors = null ) { _ex( 'Upload', 'verb' ); ?> </label> - <input type="file" name="async-upload" id="async-upload" /> + <input type="file" name="async-upload" id="async-upload" required /> <?php submit_button( _x( 'Upload', 'verb' ), 'primary', 'html-upload', false ); ?> <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e( 'Cancel' ); ?></a> </p> diff --git a/src/wp-admin/media-new.php b/src/wp-admin/media-new.php index fa50644d2d..389817a0fe 100644 --- a/src/wp-admin/media-new.php +++ b/src/wp-admin/media-new.php @@ -64,7 +64,7 @@ get_current_screen()->set_help_sidebar( require_once ABSPATH . 'wp-admin/admin-header.php'; -$form_class = 'media-upload-form type-form validate'; +$form_class = 'wp-upload-form media-upload-form type-form validate'; if ( get_user_setting( 'uploader' ) || isset( $_GET['browser-uploader'] ) ) { $form_class .= ' html-uploader'; diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index 82c8e264ad..ea76404c2e 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -1122,14 +1122,12 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; <p><?php echo $starter_copy; ?></p> </div> - <?php if ( ! $add_new_screen ) : ?> - <div id="nav-menu-bulk-actions-top" class="bulk-actions" <?php echo $hide_style; ?>> - <label class="bulk-select-button" for="bulk-select-switcher-top"> - <input type="checkbox" id="bulk-select-switcher-top" name="bulk-select-switcher-top" class="bulk-select-switcher"> - <span class="bulk-select-button-label"><?php _e( 'Bulk Select' ); ?></span> - </label> - </div> - <?php endif; ?> + <div id="nav-menu-bulk-actions-top" class="bulk-actions" <?php echo $hide_style; ?>> + <label class="bulk-select-button" for="bulk-select-switcher-top"> + <input type="checkbox" id="bulk-select-switcher-top" name="bulk-select-switcher-top" class="bulk-select-switcher"> + <span class="bulk-select-button-label"><?php _e( 'Bulk Select' ); ?></span> + </label> + </div> <?php if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) { diff --git a/src/wp-includes/class-wp-query.php b/src/wp-includes/class-wp-query.php index 21127dc755..52121e2308 100644 --- a/src/wp-includes/class-wp-query.php +++ b/src/wp-includes/class-wp-query.php @@ -5005,7 +5005,7 @@ class WP_Query { * * These arrays are sorted in the query generator for the purposes of the * WHERE clause but the arguments are not modified as they can be used for - * the orderby clase. + * the orderby clause. * * Their use in the orderby clause will generate a different SQL query so * they can be sorted for the cache key generation. diff --git a/src/wp-includes/embed.php b/src/wp-includes/embed.php index c38a079003..6ef190d0ea 100644 --- a/src/wp-includes/embed.php +++ b/src/wp-includes/embed.php @@ -791,7 +791,7 @@ function _oembed_rest_pre_serve_request( $served, $result, $request, $server ) { // Bail if there's no XML. if ( ! $result ) { status_header( 501 ); - return get_status_header_desc( 501 ); + die( get_status_header_desc( 501 ) ); } if ( ! headers_sent() ) { diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php index 3b4f461724..bb790673f7 100644 --- a/src/wp-includes/option.php +++ b/src/wp-includes/option.php @@ -1669,7 +1669,7 @@ function delete_expired_transients( $force_db = false ) { time() ) ); - } elseif ( is_multisite() && is_main_site() && is_main_network() ) { + } elseif ( is_main_site() && is_main_network() ) { // Multisite stores site transients in the sitemeta table. $wpdb->query( $wpdb->prepare( diff --git a/src/wp-includes/rewrite.php b/src/wp-includes/rewrite.php index 235c0c82e2..246846dc35 100644 --- a/src/wp-includes/rewrite.php +++ b/src/wp-includes/rewrite.php @@ -412,7 +412,7 @@ function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) { // This is the potentially clashing slug. $value = ''; - if ( $compare && array_key_exists( $compare, $query_vars ) ) { + if ( array_key_exists( $compare, $query_vars ) ) { $value = $query_vars[ $compare ]; } @@ -460,9 +460,7 @@ function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) { } // If we've gotten to this point, we have a slug/date clash. First, adjust for nextpage. - if ( '' !== $maybe_page ) { - $query_vars['page'] = (int) $maybe_page; - } + $query_vars['page'] = $maybe_page; // Next, unset autodetected date-related query vars. unset( $query_vars['year'] ); diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php index 935212652c..70b407fda8 100644 --- a/src/wp-includes/taxonomy.php +++ b/src/wp-includes/taxonomy.php @@ -1337,7 +1337,7 @@ function get_terms( $args = array(), $deprecated = '' ) { $args['taxonomy'] = $taxonomies; } else { $args = wp_parse_args( $args, $defaults ); - if ( isset( $args['taxonomy'] ) && null !== $args['taxonomy'] ) { + if ( isset( $args['taxonomy'] ) ) { $args['taxonomy'] = (array) $args['taxonomy']; } } |