From a441108f913bc325b98273bbf3889eb5feba512b Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Sat, 15 May 2010 20:57:17 +0000
Subject: [PATCH] Fix the column headers title override to use a special name
 rather than one we use elsewhere.

git-svn-id: https://develop.svn.wordpress.org/trunk@14675 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/nav-menu.php | 2 +-
 wp-admin/includes/template.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index 96d129b118..39f2dbf80f 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -1004,7 +1004,7 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
  */
 function wp_nav_menu_manage_columns() {
 	return array(
-		'title' => __('Show advanced menu properties'),
+		'_title' => __('Show advanced menu properties'),
 		'cb' => '<input type="checkbox" />',
 		'link-target' => __('Link Target'),
 		'css-classes' => __('CSS Classes'),
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 044d40fadc..445e1c919c 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3245,8 +3245,8 @@ function manage_columns_prefs($page) {
 	$hidden = get_hidden_columns($page);
 
 	foreach ( $columns as $column => $title ) {
-		// Can't hide these
-		if ( 'cb' == $column || 'title' == $column || 'name' == $column || 'username' == $column || 'media' == $column || 'comment' == $column )
+		// Can't hide these or they are special
+		if ( '_title' == $column || 'cb' == $column || 'title' == $column || 'name' == $column || 'username' == $column || 'media' == $column || 'comment' == $column )
 			continue;
 		if ( empty($title) )
 			continue;
@@ -3609,7 +3609,7 @@ function screen_meta($screen) {
 		</div>
 		<?php endif;
 		if ( ! empty($column_screens) ) : ?>
-		<h5><?php echo ( isset( $column_screens['title'] ) ?  $column_screens['title'] :  _x('Show on screen', 'Columns') ) ?></h5>
+		<h5><?php echo ( isset( $column_screens['_title'] ) ?  $column_screens['_title'] :  _x('Show on screen', 'Columns') ) ?></h5>
 		<div class="metabox-prefs">
 			<?php manage_columns_prefs($screen); ?>
 			<br class="clear" />