<!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" />
<title>[32723] trunk/src/wp-admin/includes: List tables:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32723">32723</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32723","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-10 19:30:22 +0000 (Wed, 10 Jun 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>List tables:
Since the primary column is not going to be alterable for plugins and MS themes, we don't need to check in on it.
see <a href="https://core.trac.wordpress.org/ticket/25408">#25408</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2015-06-10 14:58:42 UTC (rev 32722)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2015-06-10 19:30:22 UTC (rev 32723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,24 +438,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $column_name, $hidden ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $style = ' style="display:none;"';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $extra_class = '';
- if ( $primary === $column_name ) {
- $extra_class = ' column-primary';
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> switch ( $column_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'cb':
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<th scope='row' class='check-column'>$checkbox</th>";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'name':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<td class='theme-title{$extra_class}'$style><strong>" . $theme->display('Name') . "</strong>";
- if ( $primary === $column_name ) {
- echo $this->row_actions($actions, true);
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<td class='theme-title column-primary'$style><strong>" . $theme->display('Name') . "</strong>";
+ echo $this->row_actions($actions, true);
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</td>";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'description':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<td class='column-description desc{$extra_class}'$style>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<td class='column-description desc'$style>";
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $theme->errors() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p><strong class="attention">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,14 +483,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo implode( ' | ', $theme_meta );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $primary === $column_name ) {
- echo $this->row_actions($actions, true);
- }
</del><span class="cx" style="display: block; padding: 0 10px"> echo '</td>';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<td class='$column_name column-$column_name{$extra_class}'$style>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<td class='$column_name column-$column_name'$style>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires inside each custom column of the Multisite themes list table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,9 +500,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $primary === $column_name ) {
- echo $this->row_actions($actions, true);
- }
</del><span class="cx" style="display: block; padding: 0 10px"> echo "</td>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2015-06-10 14:58:42 UTC (rev 32722)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2015-06-10 19:30:22 UTC (rev 32723)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,8 +581,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $extra_class = ' column-primary';
-
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $column_name => $column_display_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $style = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $column_name, $hidden ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,19 +592,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<th scope='row' class='check-column'>$checkbox</th>";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'name':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $primary === $column_name || ! isset( $columns[ $primary ] ) ) {
- echo "<td class='plugin-title $extra_class'$style><strong>$plugin_name</strong>";
- echo $this->row_actions( $actions, true );
- } else {
- echo "<td class='plugin-title'$style><strong>$plugin_name</strong>";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<td class='plugin-title column-primary'$style><strong>$plugin_name</strong>";
+ echo $this->row_actions( $actions, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</td>";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'description':
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = 'column-description desc';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $primary === $column_name ) {
- $classes .= " $extra_class";
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<td class='$classes'$style>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class='plugin-description'>$description</div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,16 +646,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
</span><span class="cx" style="display: block; padding: 0 10px"> echo implode( ' | ', $plugin_meta );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $primary === $column_name ) {
- echo $this->row_actions( $actions, true );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> echo "</div></td>";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = "$column_name column-$column_name$class";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $primary === $column_name ) {
- $classes .= " $extra_class";
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<td class='$classes'$style>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,9 +664,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $primary === $column_name ) {
- echo $this->row_actions( $actions, true );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> echo "</td>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -724,9 +706,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Unalterable name for the primary column, in this case, 'plugin'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Unalterable name for the primary column, in this case, 'name'.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_primary_column_name() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 'plugin';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'name';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>