Index: wp-admin/includes/class-wp-posts-list-table.php
===================================================================
--- wp-admin/includes/class-wp-posts-list-table.php	(revision 18667)
+++ wp-admin/includes/class-wp-posts-list-table.php	(working copy)
@@ -71,7 +71,12 @@
 
 		if ( 'post' == $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
 			$sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
-			$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status != 'trash' AND ID IN ($sticky_posts)", $post_type ) );
+
+			$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "
+				SELECT COUNT( 1 ) FROM $wpdb->posts
+				WHERE post_type = %s AND post_status != 'trash'
+				AND ID IN ($sticky_posts)
+			", $post_type ) );
 		}
 
 		parent::__construct( array(
@@ -142,7 +147,10 @@
 		if ( $this->user_posts_count ) {
 			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) )
 				$class = ' class="current"';
-			$status_links['mine'] = "<a href='edit.php?post_type=$post_type&author=$current_user_id'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $this->user_posts_count, 'posts' ), number_format_i18n( $this->user_posts_count ) ) . '</a>';
+
+			$status_links['mine'] = "<a href='edit.php?post_type=$post_type&author=$current_user_id'$class>" .
+				sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $this->user_posts_count, 'posts' ), number_format_i18n( $this->user_posts_count ) ) . '</a>';
+
 			$allposts = '&all_posts=1';
 		}
 
@@ -153,7 +161,8 @@
 			$total_posts -= $num_posts->$state;
 
 		$class = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
-		$status_links['all'] = "<a href='edit.php?post_type=$post_type{$allposts}'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
+		$status_links['all'] = "<a href='edit.php?post_type=$post_type{$allposts}'$class>" .
+			sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
 
 		foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
 			$class = '';
@@ -169,7 +178,8 @@
 			if ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] )
 				$class = ' class="current"';
 
-			$status_links[$status_name] = "<a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( translate_nooped_plural( $status->label_count, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
+			$status_links[$status_name] = "<a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" .
+				sprintf( translate_nooped_plural( $status->label_count, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
 		}
 
 		if ( ! empty( $this->sticky_posts_count ) ) {
@@ -289,6 +299,7 @@
 			$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
 		else
 			$posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
+
 		$posts_columns = apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
 
 		return $posts_columns;
@@ -479,7 +490,9 @@
 		$post_format = get_post_format( $post->ID );
 		$post_format_class = ( $post_format && !is_wp_error($post_format) ) ? 'format-' . sanitize_html_class( $post_format ) : 'format-default';
 	?>
-		<tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status . ' ' . $post_format_class); ?> iedit' valign="top">
+		<tr id='post-<?php echo $post->ID; ?>'
+			class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status . ' ' . $post_format_class); ?> iedit'
+			valign="top">
 	<?php
 
 		list( $columns, $hidden ) = $this->get_column_info();
@@ -497,7 +510,10 @@
 
 			case 'cb':
 			?>
-			<th scope="row" class="check-column"><?php if ( $can_edit_post ) { ?><input type="checkbox" name="post[]" value="<?php the_ID(); ?>" /><?php } ?></th>
+			<th scope="row" class="check-column">
+				<?php if ( $can_edit_post ) { ?>
+					<input type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
+				<?php } ?></th>
 			<?php
 			break;
 
@@ -523,39 +539,70 @@
 					}
 
 					$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 ); echo isset( $parent_name ) ? ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name ) : ''; ?></strong>
-<?php
+				} else {
+					$pad = '';
 				}
-				else {
-					$attributes = 'class="post-title page-title column-title"' . $style;
-?>
-			<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 $title ?></a><?php } else { echo $title; }; _post_states( $post ); ?></strong>
-<?php
-					if ( 'excerpt' == $mode ) {
+			?>
+			<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 . $title; ?></a>
+				<?php
+					else :
+						echo $pad . $title;
+					endif;
+					_post_states( $post );
+					if ( $this->hierarchical_display ) {
+						if ( isset( $parent_name ) )
+							echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name );
+					} elseif ( 'excerpt' == $mode ) {
 						the_excerpt();
 					}
-				}
+				?></strong>
 
+			<?php
 				$actions = array();
 				if ( $can_edit_post && 'trash' != $post->post_status ) {
-					$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ) ) . '">' . __( 'Edit' ) . '</a>';
-					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr( __( 'Edit this item inline' ) ) . '">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+					$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) .
+						'" title="' . esc_attr( __( 'Edit this item' ) ) . '">'
+						. __( 'Edit' ) . '</a>';
+
+					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline"' . 
+						' title="' . esc_attr( __( 'Edit this item inline' ) ) . '">' .
+						__( 'Quick&nbsp;Edit' ) . '</a>';
 				}
 				if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
 					if ( 'trash' == $post->post_status )
-						$actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash' ) ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-' . $post->post_type . '_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
+						$actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash' ) ) .
+							"' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-' . $post->post_type . '_' . $post->ID ) . "'>"
+							. __( 'Restore' ) . "</a>";
+
 					elseif ( EMPTY_TRASH_DAYS )
-						$actions['trash'] = "<a class='submitdelete' title='" . esc_attr( __( 'Move this item to the Trash' ) ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+						$actions['trash'] = "<a class='submitdelete'" .
+							" title='" . esc_attr( __( 'Move this item to the Trash' ) ) .
+							"' href='" . get_delete_post_link( $post->ID ) . "'>" .
+							__( 'Trash' ) . "</a>";
+
 					if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
-						$actions['delete'] = "<a class='submitdelete' title='" . esc_attr( __( 'Delete this item permanently' ) ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+						$actions['delete'] = "<a class='submitdelete'" .
+							"title='" . esc_attr( __( 'Delete this item permanently' ) ) .
+							"' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" .
+							__( 'Delete Permanently' ) . "</a>";
 				}
 				if ( $post_type_object->public ) {
 					if ( in_array( $post->post_status, array( 'pending', 'draft' ) ) ) {
 						if ( $can_edit_post )
-							$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) . '" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'Preview' ) . '</a>';
+							$actions['view'] = '<a href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) ) .
+								'" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) .
+								'" rel="permalink">' .
+								__( 'Preview' ) . '</a>';
+
 					} elseif ( 'trash' != $post->post_status ) {
-						$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+						$actions['view'] = '<a href="' . get_permalink( $post->ID ) .
+							'" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) .
+							'" rel="permalink">' .
+							__( 'View' ) . '</a>';
 					}
 				}
 
@@ -724,7 +771,8 @@
 		$bulk = 0;
 		while ( $bulk < 2 ) { ?>
 
-		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-$screen->post_type ";
+		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" 
+			class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-$screen->post_type ";
 			echo $bulk ? "bulk-edit-row bulk-edit-row-$hclass bulk-edit-$screen->post_type" : "quick-edit-row quick-edit-row-$hclass inline-edit-$screen->post_type";
 		?>" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
@@ -742,12 +790,14 @@
 
 			<label>
 				<span class="title"><?php _e( 'Title' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
+				<span class="input-text-wrap">
+					<input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
 			<label>
 				<span class="title"><?php _e( 'Slug' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
+				<span class="input-text-wrap">
+					<input type="text" name="post_name" value="" /></span>
 			</label>
 
 	<?php endif; // $bulk
@@ -794,7 +844,8 @@
 			<div class="inline-edit-group">
 				<label class="alignleft">
 					<span class="title"><?php _e( 'Password' ); ?></span>
-					<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
+					<span class="input-text-wrap">
+						<input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
 				</label>
 
 				<em style="margin:5px 10px 0 0" class="alignleft">
@@ -847,9 +898,18 @@
 			<label>
 				<span class="title"><?php _e( 'Parent' ); ?></span>
 	<?php
-		$dropdown_args = array( 'post_type' => $post_type_object->name, 'selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __( 'Main Page (no parent)' ), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title' );
+		$dropdown_args = array(
+			'post_type' => $post_type_object->name,
+			'selected' => $post->post_parent,
+			'name' => 'post_parent',
+			'show_option_none' => __( 'Main Page (no parent)' ),
+			'option_none_value' => 0,
+			'sort_column'=> 'menu_order, post_title'
+		);
+
 		if ( $bulk )
 			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+
 		$dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );
 		wp_dropdown_pages( $dropdown_args );
 	?>
@@ -862,7 +922,8 @@
 
 			<label>
 				<span class="title"><?php _e( 'Order' ); ?></span>
-				<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
+				<span class="input-text-wrap">
+					<input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
 			</label>
 
 	<?php	endif; // !$bulk