Changeset 23372

Timestamp:

02/02/2013 01:54:06 AM (12 years ago)

Author:

nacin

Message:

Clean up rendering of the title column in the posts list table. Simplify branching. Use get_userdata() rather than get_user_by( 'id' ). Change string to '%s is currently editing'. see #23312.

File:

• trunk/wp-admin/includes/class-wp-posts-list-table.php (modified) (3 diffs)

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -473 +473 @@
         $post_type_object = get_post_type_object( $post->post_type );
         $can_edit_post = current_user_can( $post_type_object->cap->edit_post, $post->ID );
-        $lock_holder_id = wp_check_post_lock( $post->ID );
-        $lock_holder = '';
 
         $alternate = 'alternate' == $alternate ? '' : 'alternate';
         $classes = $alternate . ' iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
-    
-        if ( $lock_holder_id ) {
+
+        $lock_holder = wp_check_post_lock( $post->ID );
+        if ( $lock_holder ) {
             $classes .= ' wp-locked';
-            $lock_holder_data = get_user_by( 'id', $lock_holder_id );
-
-            if ( $lock_holder_data )
-                $lock_holder = esc_html( sprintf( __('Currently edited by %s'), $lock_holder_data->data->display_name ) );
+            $lock_holder = get_userdata( $lock_holder );
         }
     ?>
@@ -521 +517 @@
 
             case 'title':
+                $attributes = 'class="post-title page-title column-title"' . $style;
                 if ( $this->hierarchical_display ) {
-                    $attributes = 'class="post-title page-title column-title"' . $style;
-
                     if ( 0 == $level && (int) $post->post_parent > 0 ) {
                         //sent level 0 by accident, by default, or because we don't know the actual level
@@ -540 +535 @@
                         }
                     }
-
-                    $pad = str_repeat( '— ', $level );
-
-                    ?>
-                    <td <?php echo $attributes ?>><strong><?php if ( $can_edit_post && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states( $post ); echo isset( $parent_name ) ? ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name ) : ''; ?></strong>
-                    <?php
-
-                    if ( $can_edit_post && $post->post_status != 'trash' ) {
-                        ?>
-                        <span class="lock-holder"><?php echo $lock_holder; ?></span>
-                        <?php
-                    }
+                }
+
+                $pad = str_repeat( '&#8212; ', $level );
+                echo "<td $attributes><strong>";
+                if ( $can_edit_post && $post->post_status != 'trash' ) {
+                    echo '<a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ) . '">' . $pad . $title . '</a>';
                 } else {
-                    $attributes = 'class="post-title page-title column-title"' . $style;
-
-                    $pad = str_repeat( '&#8212; ', $level );
-
-                    ?>
-                    <td <?php echo $attributes ?>><strong><?php if ( $can_edit_post && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states( $post ); ?></strong>
-                    <?php
-
-                    if ( $can_edit_post && $post->post_status != 'trash' ) {
-                        ?>
-                        <span class="lock-holder"><?php echo $lock_holder; ?></span>
-                        <?php
-                    }
-
-                    if ( 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) )
+                    echo $pad . $title;
+                }
+                _post_states( $post );
+
+                if ( isset( $parent_name ) )
+                    echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name );
+
+                echo "</strong>\n";
+
+                if ( $lock_holder && $can_edit_post && $post->post_status != 'trash' ) {
+                    printf( '<span class="lock-holder">%s</span>',
+                        esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name )  ) );
+                }
+
+                if ( ! $this->hierarchical_display && 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) )
                         the_excerpt();
-                }
 
                 $actions = array();