<!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>[16545] trunk/wp-admin/includes/class-wp-ms-sites-list-table.php:
  Implement proper column show/
 hide behaviour based on screen options for the Network Admin Sites table.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16545">16545</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-11-23 11:39:50 +0000 (Tue, 23 Nov 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Implement proper column show/hide behaviour based on screen options for the Network Admin Sites table.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (16544 => 16545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php        2010-11-23 00:49:23 UTC (rev 16544)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php        2010-11-23 11:39:50 UTC (rev 16545)
</span><span class="lines">@@ -200,6 +200,10 @@
</span><span class="cx">                         list( $columns, $hidden ) = $this-&gt;get_column_info();
</span><span class="cx"> 
</span><span class="cx">                         foreach ( $columns as $column_name =&gt; $column_display_name ) {
</span><ins>+                                $style = '';
+                                if ( in_array( $column_name, $hidden ) )
+                                        $style = ' style=&quot;display:none;&quot;';
+
</ins><span class="cx">                                 switch ( $column_name ) {
</span><span class="cx">                                         case 'cb': ?&gt;
</span><span class="cx">                                                 &lt;th scope=&quot;row&quot; class=&quot;check-column&quot;&gt;
</span><span class="lines">@@ -208,15 +212,15 @@
</span><span class="cx">                                         &lt;?php
</span><span class="cx">                                         break;
</span><span class="cx"> 
</span><del>-                                        case 'id': ?&gt;
</del><ins>+                                        case 'id':?&gt;
</ins><span class="cx">                                                 &lt;th valign=&quot;top&quot; scope=&quot;row&quot;&gt;
</span><span class="cx">                                                         &lt;?php echo $blog['blog_id'] ?&gt;
</span><span class="cx">                                                 &lt;/th&gt;
</span><span class="cx">                                         &lt;?php
</span><span class="cx">                                         break;
</span><span class="cx"> 
</span><del>-                                        case 'blogname': ?&gt;
-                                                &lt;td class=&quot;column-title&quot;&gt;
</del><ins>+                                        case 'blogname':
+                                                echo &quot;&lt;td class='column-$column_name $column_name'$style&gt;&quot;; ?&gt;
</ins><span class="cx">                                                         &lt;a href=&quot;&lt;?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?&gt;&quot; class=&quot;edit&quot;&gt;&lt;?php echo $blogname . $blog_state; ?&gt;&lt;/a&gt;
</span><span class="cx">                                                         &lt;?php
</span><span class="cx">                                                         if ( 'list' != $mode )
</span><span class="lines">@@ -262,9 +266,8 @@
</span><span class="cx">                                         &lt;?php
</span><span class="cx">                                         break;
</span><span class="cx"> 
</span><del>-                                        case 'lastupdated': ?&gt;
-                                                &lt;td valign=&quot;top&quot;&gt;
-                                                        &lt;?php
</del><ins>+                                        case 'lastupdated':
+                                                echo &quot;&lt;td valign='top'class='$column_name column-$column_name'$style&gt;&quot;;
</ins><span class="cx">                                                         if ( 'list' == $mode )
</span><span class="cx">                                                                 $date = 'Y/m/d';
</span><span class="cx">                                                         else
</span><span class="lines">@@ -273,9 +276,8 @@
</span><span class="cx">                                                 &lt;/td&gt;
</span><span class="cx">                                         &lt;?php
</span><span class="cx">                                         break;
</span><del>-                                case 'registered': ?&gt;
-                                                &lt;td valign=&quot;top&quot;&gt;
-                                                &lt;?php
</del><ins>+                                case 'registered':
+                                                echo &quot;&lt;td valign='top'class='$column_name column-$column_name'$style&gt;&quot;;
</ins><span class="cx">                                                 if ( $blog['registered'] == '0000-00-00 00:00:00' )
</span><span class="cx">                                                         echo '&amp;#x2014;';
</span><span class="cx">                                                 else
</span><span class="lines">@@ -284,9 +286,8 @@
</span><span class="cx">                                                 &lt;/td&gt;
</span><span class="cx">                                         &lt;?php
</span><span class="cx">                                         break;
</span><del>-                                case 'users': ?&gt;
-                                                &lt;td valign=&quot;top&quot;&gt;
-                                                        &lt;?php
</del><ins>+                                case 'users':
+                                                echo &quot;&lt;td valign='top'class='$column_name column-$column_name'$style&gt;&quot;;
</ins><span class="cx">                                                         $blogusers = get_users( array( 'blog_id' =&gt; $blog['blog_id'], 'number' =&gt; 6) );
</span><span class="cx">                                                         if ( is_array( $blogusers ) ) {
</span><span class="cx">                                                                 $blogusers_warning = '';
</span><span class="lines">@@ -316,13 +317,11 @@
</span><span class="cx">                                                 &lt;?php } ?&gt;
</span><span class="cx">                                         &lt;?php break;
</span><span class="cx"> 
</span><del>-                                default: ?&gt;
-                                                &lt;?php if ( has_filter( 'manage_blogs_custom_column' ) ) { ?&gt;
-                                                &lt;td valign=&quot;top&quot;&gt;
-                                                        &lt;?php do_action( 'manage_blogs_custom_column', $column_name, $blog['blog_id'] ); ?&gt;
-                                                &lt;/td&gt;
-                                                &lt;?php } ?&gt;
-                                        &lt;?php break;
</del><ins>+                                default:
+                                        echo &quot;&lt;td class='$column_name column-$column_name'$style&gt;&quot;;
+                                        do_action( 'manage_themes_custom_column', $column_name, $theme_key, $theme );
+                                        echo &quot;&lt;/td&gt;&quot;;
+                                        break;
</ins><span class="cx">                                 }
</span><span class="cx">                         }
</span><span class="cx">                         ?&gt;
</span></span></pre>
</div>
</div>

</body>
</html>