diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
index 67ef22e183..05e5f82ad1 100644
--- a/src/wp-admin/css/list-tables.css
+++ b/src/wp-admin/css/list-tables.css
@@ -555,15 +555,13 @@ tr.wp-locked .locked-indicator {
width: 16px;
}
-tr.wp-locked .locked-indicator:before {
+tr.wp-locked .locked-indicator-icon:before {
color: #82878c;
content: "\f160";
display: inline-block;
- float: left;
font: normal 20px/1 dashicons;
speak: none;
vertical-align: middle;
- margin-left: 0;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
@@ -581,7 +579,7 @@ tr .locked-info {
}
tr.wp-locked .locked-info {
- margin-top: 8px;
+ margin-top: 4px;
height: auto;
opacity: 1;
}
diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index d26ab2f11b..f228805c78 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -835,7 +835,16 @@ class WP_Posts_List_Table extends WP_List_Table {
printf( __( 'Select %s' ), _draft_or_post_title() );
?>
-
+
+
+
+
ID );
+
+ if ( $can_edit_post && $post->post_status != 'trash' ) {
+ $lock_holder = wp_check_post_lock( $post->ID );
+
+ if ( $lock_holder ) {
+ $lock_holder = get_userdata( $lock_holder );
+ $locked_avatar = get_avatar( $lock_holder->ID, 18 );
+ $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+ } else {
+ $locked_avatar = $locked_text = '';
+ }
+
+ echo '' . $locked_avatar . ' ' . $locked_text . "
\n";
+ }
+
$pad = str_repeat( '— ', $this->current_level );
echo "";
@@ -907,7 +932,6 @@ class WP_Posts_List_Table extends WP_List_Table {
echo $this->get_edit_link( $format_args, $label . ':', $format_class );
}
- $can_edit_post = current_user_can( 'edit_post', $post->ID );
$title = _draft_or_post_title();
if ( $can_edit_post && $post->post_status != 'trash' ) {
@@ -930,20 +954,6 @@ class WP_Posts_List_Table extends WP_List_Table {
}
echo "\n";
- if ( $can_edit_post && $post->post_status != 'trash' ) {
- $lock_holder = wp_check_post_lock( $post->ID );
-
- if ( $lock_holder ) {
- $lock_holder = get_userdata( $lock_holder );
- $locked_avatar = get_avatar( $lock_holder->ID, 18 );
- $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
- } else {
- $locked_avatar = $locked_text = '';
- }
-
- echo '' . $locked_avatar . ' ' . $locked_text . "
\n";
- }
-
if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
the_excerpt();
}