diff options
Diffstat (limited to 'www/crm/wp-admin/includes')
| -rw-r--r-- | www/crm/wp-admin/includes/ajax-actions.php | 9 | ||||
| -rw-r--r-- | www/crm/wp-admin/includes/class-wp-plugins-list-table.php | 2 | ||||
| -rw-r--r-- | www/crm/wp-admin/includes/ms.php | 6 | ||||
| -rw-r--r-- | www/crm/wp-admin/includes/network.php | 14 | ||||
| -rw-r--r-- | www/crm/wp-admin/includes/plugin-install.php | 2 | ||||
| -rw-r--r-- | www/crm/wp-admin/includes/template.php | 10 |
6 files changed, 25 insertions, 18 deletions
diff --git a/www/crm/wp-admin/includes/ajax-actions.php b/www/crm/wp-admin/includes/ajax-actions.php index da9acdc7..347afd7b 100644 --- a/www/crm/wp-admin/includes/ajax-actions.php +++ b/www/crm/wp-admin/includes/ajax-actions.php @@ -1423,6 +1423,7 @@ function wp_ajax_add_menu_item() { $menu_obj = get_post( $menu_item_id ); if ( ! empty( $menu_obj->ID ) ) { $menu_obj = wp_setup_nav_menu_item( $menu_obj ); + $menu_obj->title = empty( $menu_obj->title ) ? __( 'Menu Item' ) : $menu_obj->title; $menu_obj->label = $menu_obj->title; // don't show "(pending)" in ajax-added items $menu_items[] = $menu_obj; } @@ -2311,7 +2312,7 @@ function wp_ajax_upload_attachment() { 'success' => false, 'data' => array( 'message' => __( 'Sorry, you are not allowed to upload files.' ), - 'filename' => $_FILES['async-upload']['name'], + 'filename' => esc_html( $_FILES['async-upload']['name'] ), ), ) ); @@ -2327,7 +2328,7 @@ function wp_ajax_upload_attachment() { 'success' => false, 'data' => array( 'message' => __( 'Sorry, you are not allowed to attach files to this post.' ), - 'filename' => $_FILES['async-upload']['name'], + 'filename' => esc_html( $_FILES['async-upload']['name'] ), ), ) ); @@ -2353,7 +2354,7 @@ function wp_ajax_upload_attachment() { 'success' => false, 'data' => array( 'message' => __( 'The uploaded file is not a valid image. Please try again.' ), - 'filename' => $_FILES['async-upload']['name'], + 'filename' => esc_html( $_FILES['async-upload']['name'] ), ), ) ); @@ -2370,7 +2371,7 @@ function wp_ajax_upload_attachment() { 'success' => false, 'data' => array( 'message' => $attachment_id->get_error_message(), - 'filename' => $_FILES['async-upload']['name'], + 'filename' => esc_html( $_FILES['async-upload']['name'] ), ), ) ); diff --git a/www/crm/wp-admin/includes/class-wp-plugins-list-table.php b/www/crm/wp-admin/includes/class-wp-plugins-list-table.php index 90dec9da..92d1a945 100644 --- a/www/crm/wp-admin/includes/class-wp-plugins-list-table.php +++ b/www/crm/wp-admin/includes/class-wp-plugins-list-table.php @@ -761,7 +761,7 @@ class WP_Plugins_List_Table extends WP_List_Table { } - $requires_php = isset( $plugin['requires_php'] ) ? $plugin['requires_php'] : null; + $requires_php = isset( $plugin_data['requires_php'] ) ? $plugin_data['requires_php'] : null; $compatible_php = is_php_version_compatible( $requires_php ); $class = $is_active ? 'active' : 'inactive'; $checkbox_id = 'checkbox_' . md5( $plugin_data['Name'] ); diff --git a/www/crm/wp-admin/includes/ms.php b/www/crm/wp-admin/includes/ms.php index 6d997f9c..54d638f6 100644 --- a/www/crm/wp-admin/includes/ms.php +++ b/www/crm/wp-admin/includes/ms.php @@ -802,7 +802,7 @@ function avoid_blog_page_permalink_collision( $data, $postarr ) { */ function choose_primary_blog() { ?> - <table class="form-table"> + <table class="form-table" role="presentation"> <tr> <?php /* translators: My sites label */ ?> <th scope="row"><label for="primary_blog"><?php _e( 'Primary Site' ); ?></label></th> @@ -914,7 +914,7 @@ function confirm_delete_users( $users ) { $site_admins = get_super_admins(); $admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?> - <table class="form-table"> + <table class="form-table" role="presentation"> <?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) { if ( $user_id != '' && $user_id != '0' ) { @@ -984,7 +984,7 @@ function confirm_delete_users( $users ) { echo '</fieldset></td></tr>'; } else { ?> - <td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p> + <td><p><?php _e( 'User has no sites or content and will be deleted.' ); ?></p></td> <?php } ?> </tr> <?php diff --git a/www/crm/wp-admin/includes/network.php b/www/crm/wp-admin/includes/network.php index ea6ec24b..055d193c 100644 --- a/www/crm/wp-admin/includes/network.php +++ b/www/crm/wp-admin/includes/network.php @@ -223,7 +223,7 @@ function network_step1( $errors = false ) { <strong><?php _e( 'You cannot change this later.' ); ?></strong></p> <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p> <?php // @todo: Link to an MS readme? ?> - <table class="form-table"> + <table class="form-table" role="presentation"> <tr> <th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th> <td> @@ -272,7 +272,7 @@ function network_step1( $errors = false ) { ); ?> </p> - <table class="form-table"> + <table class="form-table" role="presentation"> <tr> <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> <td> @@ -289,7 +289,7 @@ function network_step1( $errors = false ) { <?php endif; ?> <h3><?php esc_html_e( 'Network Details' ); ?></h3> - <table class="form-table"> + <table class="form-table" role="presentation"> <?php if ( 'localhost' == $hostname ) : ?> <tr> <th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th> @@ -347,18 +347,18 @@ function network_step1( $errors = false ) { </tr> <?php endif; ?> <tr> - <th scope='row'><?php esc_html_e( 'Network Title' ); ?></th> + <th scope='row'><label for="sitename"><?php esc_html_e( 'Network Title' ); ?></label></th> <td> - <input name='sitename' type='text' size='45' value='<?php echo esc_attr( $site_name ); ?>' /> + <input name='sitename' id='sitename' type='text' size='45' value='<?php echo esc_attr( $site_name ); ?>' /> <p class="description"> <?php _e( 'What would you like to call your network?' ); ?> </p> </td> </tr> <tr> - <th scope='row'><?php esc_html_e( 'Network Admin Email' ); ?></th> + <th scope='row'><label for="email"><?php esc_html_e( 'Network Admin Email' ); ?></label></th> <td> - <input name='email' type='text' size='45' value='<?php echo esc_attr( $admin_email ); ?>' /> + <input name='email' id='email' type='text' size='45' value='<?php echo esc_attr( $admin_email ); ?>' /> <p class="description"> <?php _e( 'Your email address.' ); ?> </p> diff --git a/www/crm/wp-admin/includes/plugin-install.php b/www/crm/wp-admin/includes/plugin-install.php index b5f770d6..4fa007e3 100644 --- a/www/crm/wp-admin/includes/plugin-install.php +++ b/www/crm/wp-admin/includes/plugin-install.php @@ -752,7 +752,7 @@ function install_plugin_information() { <?php } ?> <?php } ?> </div> - <div id="section-holder" class="wrap"> + <div id="section-holder"> <?php $requires_php = isset( $api->requires_php ) ? $api->requires_php : null; $requires_wp = isset( $api->requires ) ? $api->requires : null; diff --git a/www/crm/wp-admin/includes/template.php b/www/crm/wp-admin/includes/template.php index a06f9228..d6a705ea 100644 --- a/www/crm/wp-admin/includes/template.php +++ b/www/crm/wp-admin/includes/template.php @@ -1122,7 +1122,13 @@ function do_block_editor_incompatible_meta_box( $object, $box ) { echo '</p>'; } } elseif ( $object instanceof WP_Post ) { - $edit_url = add_query_arg( 'classic-editor', '', get_edit_post_link( $object ) ); + $edit_url = add_query_arg( + array( + 'classic-editor' => '', + 'classic-editor__forget' => '', + ), + get_edit_post_link( $object ) + ); echo '<p>'; /* translators: %s: A link to use the Classic Editor plugin. */ printf( __( 'Please open the <a href="%s">classic editor</a> to use this meta box.' ), esc_url( $edit_url ) ); @@ -1605,7 +1611,7 @@ function do_settings_sections( $page ) { if ( ! isset( $wp_settings_fields ) || ! isset( $wp_settings_fields[ $page ] ) || ! isset( $wp_settings_fields[ $page ][ $section['id'] ] ) ) { continue; } - echo '<table class="form-table">'; + echo '<table class="form-table" role="presentation">'; do_settings_fields( $page, $section['id'] ); echo '</table>'; } |