<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--

#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }

#msg ul, pre { overflow: auto; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<title>[14637] trunk/wp-admin/includes/template.php:

  Try and tidy up the show_screen logic a little.</title>

</head>

<body>

<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14637">14637</a></dd>

<dt>Author</dt> <dd>westi</dd>

<dt>Date</dt> <dd>2010-05-14 16:39:56 +0000 (Fri, 14 May 2010)</dd>

</dl>

<h3>Log Message</h3>

<pre>Try and tidy up the show_screen logic a little.

Implement a better override of the column header.

See <a href="http://trac.wordpress.org/ticket/13393">#13393</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminincludestemplatephp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (14636 => 14637)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/template.php        2010-05-14 16:12:46 UTC (rev 14636)

+++ trunk/wp-admin/includes/template.php        2010-05-14 16:39:56 UTC (rev 14637)

</span><span class="lines">@@ -3591,9 +3591,10 @@

</span><span class="cx">         switch ( $screen-&gt;id ) {

</span><span class="cx">                 case 'widgets':

</span><span class="cx">                         $settings = '&lt;p&gt;&lt;a id=&quot;access-on&quot; href=&quot;widgets.php?widgets-access=on&quot;&gt;' . __('Enable accessibility mode') . '&lt;/a&gt;&lt;a id=&quot;access-off&quot; href=&quot;widgets.php?widgets-access=off&quot;&gt;' . __('Disable accessibility mode') . &quot;&lt;/a&gt;&lt;/p&gt;\n&quot;;

</span><ins>+                        $show_screen = true;

</ins><span class="cx">                         break;

</span><span class="cx">         }

</span><del>-        if( $settings )

</del><ins>+        if( !empty($settings) )

</ins><span class="cx">                 $show_screen = true;

</span><span class="cx"> ?&gt;

</span><span class="cx"> &lt;div id=&quot;screen-meta&quot;&gt;

</span><span class="lines">@@ -3608,7 +3609,7 @@

</span><span class="cx">                 &lt;/div&gt;

</span><span class="cx">                 &lt;?php endif;

</span><span class="cx">                 if ( ! empty($column_screens) ) : ?&gt;

</span><del>-                &lt;h5&gt;&lt;?php echo _x('Show on screen', 'Columns') ?&gt;&lt;/h5&gt;

</del><ins>+                &lt;h5&gt;&lt;?php echo ( isset( $column_screens['title'] ) ?  $column_screens['title'] :  _x('Show on screen', 'Columns') ) ?&gt;&lt;/h5&gt;

</ins><span class="cx">                 &lt;div class=&quot;metabox-prefs&quot;&gt;

</span><span class="cx">                         &lt;?php manage_columns_prefs($screen); ?&gt;

</span><span class="cx">                         &lt;br class=&quot;clear&quot; /&gt;

</span></span></pre>

</div>

</div>

</body>

</html>