From bbc1edced6d45ebf1da41b26f9f00af118aa86c8 Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Fri, 14 May 2010 16:39:56 +0000
Subject: [PATCH] Try and tidy up the show_screen logic a little. Implement a
 better override of the column header. See #13393.

git-svn-id: https://develop.svn.wordpress.org/trunk@14637 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/template.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 232d53ab33..aeb2ef8039 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3591,9 +3591,10 @@ function screen_meta($screen) {
 	switch ( $screen->id ) {
 		case 'widgets':
 			$settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
+			$show_screen = true;
 			break;
 	}
-	if( $settings )
+	if( !empty($settings) )
 		$show_screen = true;
 ?>
 <div id="screen-meta">
@@ -3608,7 +3609,7 @@ function screen_meta($screen) {
 		</div>
 		<?php endif;
 		if ( ! empty($column_screens) ) : ?>
-		<h5><?php echo _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" />