<!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>[32756] trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php: In `WP_MS_Themes_List_Table::display_rows()`:</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/32756">32756</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/32756","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-13 16:53:06 +0000 (Sat, 13 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'>In `WP_MS_Themes_List_Table::display_rows()`:
* Move the giant `switch` statement into methods
* Call `->single_row_columns()`, which we now override
See <a href="https://core.trac.wordpress.org/ticket/29881">#29881</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>
</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-13 16:23:01 UTC (rev 32755)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2015-06-13 16:53:06 UTC (rev 32756)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,15 +336,29 @@
</span><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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.3.0
+ *
+ * @param WP_Theme $theme
+ */
+ public function column_cb( $theme ) {
+ $checkbox_id = 'checkbox_' . md5( $theme->get('Name') );
+ ?>
+ <input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ) ?>" id="<?php echo $checkbox_id ?>" />
+ <label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e( 'Select' ) ?> <?php echo $theme->display( 'Name' ) ?></label>
+ <?php
+ }
+
+ /**
+ * @since 4.3.0
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global string $status
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global int $page
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global int $page
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global string $s
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global array $totals
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Theme $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">- public function single_row( $theme ) {
- global $status, $page, $s, $totals;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function column_name( $theme ) {
+ global $status, $page, $s;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $context = $status;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,18 +382,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_key = urlencode( $stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $allowed ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $theme->errors() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $theme->errors() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['enable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=enable&theme=' . $theme_key . '&paged=' . $page . '&s=' . $s, 'enable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__('Enable this theme') . '" class="edit">' . ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) ) . '</a>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['disable'] = '<a href="' . esc_url( wp_nonce_url($url . 'action=disable&theme=' . $theme_key . '&paged=' . $page . '&s=' . $s, 'disable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__('Disable this theme') . '">' . ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 ( current_user_can('edit_themes') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can('edit_themes') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = '<a href="' . esc_url('theme-editor.php?theme=' . $theme_key ) . '" title="' . esc_attr__('Open this theme in the Theme Editor') . '" class="edit">' . __('Edit') . '</a>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['delete'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=delete-selected&checked[]=' . $theme_key . '&theme_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-themes' ) ) . '" title="' . esc_attr__( 'Delete this theme' ) . '" class="delete">' . __( 'Delete' ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the action links displayed for each theme in the Multisite
</span><span class="cx" style="display: block; padding: 0 10px"> * themes list table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,17 +436,93 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, $context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ! $allowed ? 'inactive' : 'active';
- $checkbox_id = "checkbox_" . md5( $theme->get('Name') );
- $checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $stylesheet ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme->display('Name') . "</label>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $this->row_actions( $actions, true );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = sanitize_html_class( $theme->get_stylesheet() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @since 4.3.0
+ *
+ * @global string $status
+ * @global array $totals
+ *
+ * @param WP_Theme $theme
+ */
+ public function column_description( $theme ) {
+ global $status, $totals;
+ if ( $theme->errors() ) {
+ $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
+ echo '<p><strong class="attention">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_site_themes ) {
+ $allowed = $theme->is_allowed( 'site', $this->site_id );
+ } else {
+ $allowed = $theme->is_allowed( 'network' );
+ }
+
+ $class = ! $allowed ? 'inactive' : 'active';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $class .= ' update';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<tr id='$id' class='$class'>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
+ <div class='$class second theme-version-author-uri'>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stylesheet = $theme->get_stylesheet();
+ $theme_meta = array();
+
+ if ( $theme->get('Version') ) {
+ $theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
+ }
+ $theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
+
+ if ( $theme->get('ThemeURI') ) {
+ $theme_meta[] = '<a href="' . $theme->display('ThemeURI') . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
+ }
+ /**
+ * Filter the array of row meta for each theme in the Multisite themes
+ * list table.
+ *
+ * @since 3.1.0
+ *
+ * @param array $theme_meta An array of the theme's metadata,
+ * including the version, author, and
+ * theme URI.
+ * @param string $stylesheet Directory name of the theme.
+ * @param WP_Theme $theme WP_Theme object.
+ * @param string $status Status of the theme.
+ */
+ $theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
+ echo implode( ' | ', $theme_meta );
+
+ echo '</div>';
+ }
+
+ /**
+ * @since 4.3.0
+ *
+ * @param WP_Theme $theme
+ * @param string $column_name
+ */
+ public function column_default( $theme, $column_name ) {
+ $stylesheet = $theme->get_stylesheet();
+ /**
+ * Fires inside each custom column of the Multisite themes list table.
+ *
+ * @since 3.1.0
+ *
+ * @param string $column_name Name of the column.
+ * @param string $stylesheet Directory name of the theme.
+ * @param WP_Theme $theme Current WP_Theme object.
+ */
+ do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+ }
+
+ /**
+ * @since 4.3.0
+ *
+ * @param WP_Theme $item
+ */
+ public function single_row_columns( $item ) {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $column_name => $column_display_name ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,70 +533,69 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<th scope='row' class='check-column'>$checkbox</th>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<th scope="row" class="check-column">';
+
+ $this->column_cb( $item );
+
+ echo '</th>';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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 column-primary{$extra_classes}'><strong>" . $theme->display('Name') . "</strong>";
- 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{$extra_classes}'><strong>" . $item->display('Name') . "</strong>";
+
+ $this->column_name( $item );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</td>";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'description':
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<td class='column-description desc{$extra_classes}'>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $theme->errors() ) {
- $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
- echo '<p><strong class="attention">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
- }
- echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
- <div class='$class second theme-version-author-uri'>";
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme_meta = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->column_description( $item );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $theme->get('Version') )
- $theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
-
- $theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
-
- if ( $theme->get('ThemeURI') )
- $theme_meta[] = '<a href="' . $theme->display('ThemeURI') . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
-
- /**
- * Filter the array of row meta for each theme in the Multisite themes
- * list table.
- *
- * @since 3.1.0
- *
- * @param array $theme_meta An array of the theme's metadata,
- * including the version, author, and
- * theme URI.
- * @param string $stylesheet Directory name of the theme.
- * @param WP_Theme $theme WP_Theme object.
- * @param string $status Status of the theme.
- */
- $theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
- echo implode( ' | ', $theme_meta );
-
- echo '</div>';
</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><span class="cx" style="display: block; padding: 0 10px"> echo "<td class='$column_name column-$column_name{$extra_classes}'>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Fires inside each custom column of the Multisite themes list table.
- *
- * @since 3.1.0
- *
- * @param string $column_name Name of the column.
- * @param string $stylesheet Directory name of the theme.
- * @param WP_Theme $theme Current WP_Theme object.
- */
- do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->column_default( $item, $column_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "</td>";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ break;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @global string $status
+ * @global array $totals
+ *
+ * @param WP_Theme $theme
+ */
+ public function single_row( $theme ) {
+ global $status, $totals;
+
+ if ( $this->is_site_themes ) {
+ $allowed = $theme->is_allowed( 'site', $this->site_id );
+ } else {
+ $allowed = $theme->is_allowed( 'network' );
+ }
+
+ $stylesheet = $theme->get_stylesheet();
+
+ $class = ! $allowed ? 'inactive' : 'active';
+
+ $id = sanitize_html_class( $theme->get_stylesheet() );
+
+ if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
+ $class .= ' update';
+ }
+
+ echo "<tr id='$id' class='$class'>";
+
+ $this->single_row_columns( $theme );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</tr>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_themes )
</span></span></pre>
</div>
</div>
</body>
</html>