<!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>[20104] trunk/wp-admin/includes: Partially revert [20100].</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20104">20104</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-03-03 02:40:43 +0000 (Sat, 03 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Partially revert <a href="http://core.trac.wordpress.org/changeset/20100">[20100]</a>. The list_args JS variable cannot be extended due to its use as an argument in fetch-list. see <a href="http://core.trac.wordpress.org/ticket/19815">#19815</a>.
We should reattempt extending the args created in WP_List_Table, but will need to deprecate the current list_args to do so.
Also, infinite scroll on themes pages is no longer broken. Go team.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpthemeslisttablephp">trunk/wp-admin/includes/class-wp-themes-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (20103 => 20104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2012-03-03 00:30:21 UTC (rev 20103)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2012-03-03 02:40:43 UTC (rev 20104)
</span><span class="lines">@@ -903,7 +903,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>- function _js_vars( $extra_args = array() ) {
</del><ins>+ function _js_vars() {
</ins><span class="cx"> $current_screen = get_current_screen();
</span><span class="cx">
</span><span class="cx"> $args = array(
</span><span class="lines">@@ -914,9 +914,6 @@
</span><span class="cx"> )
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( is_array( $extra_args ) )
- $args = array_merge( $args, $extra_args );
-
</del><span class="cx"> printf( "<script type='text/javascript'>list_args = %s;</script>\n", json_encode( $args ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-themes-list-table.php (20103 => 20104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-themes-list-table.php 2012-03-03 00:30:21 UTC (rev 20103)
+++ trunk/wp-admin/includes/class-wp-themes-list-table.php 2012-03-03 02:40:43 UTC (rev 20104)
</span><span class="lines">@@ -125,12 +125,12 @@
</span><span class="cx"> $title = $theme->display('Name');
</span><span class="cx"> $version = $theme->display('Version');
</span><span class="cx"> $author = $theme->display('Author');
</span><del>-
</del><ins>+
</ins><span class="cx"> $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $template );
</span><span class="cx"> $preview_link = esc_url( add_query_arg(
</span><span class="cx"> array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => true, 'TB_iframe' => 'true' ),
</span><span class="cx"> home_url( '/' ) ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $actions = array();
</span><span class="cx"> $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="'
</span><span class="cx"> . esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Activate' ) . '</a>';
</span><span class="lines">@@ -140,9 +140,9 @@
</span><span class="cx"> $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet )
</span><span class="cx"> . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n 'Cancel' to stop, 'OK' to delete." ), $title ) )
</span><span class="cx"> . "' );" . '">' . __( 'Delete' ) . '</a>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $actions = apply_filters( 'theme_action_links', $actions, $theme );
</span><del>-
</del><ins>+
</ins><span class="cx"> $actions = implode ( ' | ', $actions );
</span><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo $preview_link; ?>" class="thickbox thickbox-preview screenshot">
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> <h3><?php
</span><span class="cx"> /* translators: 1: theme title, 2: theme version, 3: theme author */
</span><span class="cx"> printf( __( '%1$s %2$s by %3$s' ), $title, $version, $author ) ; ?></h3>
</span><del>-
</del><ins>+
</ins><span class="cx"> <span class='action-links'><?php echo $actions ?></span>
</span><span class="cx"> <span class="separator hide-if-no-js">| </span><a href="#" class="theme-detail hide-if-no-js" tabindex='4'><?php _e('Details') ?></a>
</span><span class="cx"> <div class="themedetaildiv hide-if-js">
</span><span class="lines">@@ -227,6 +227,7 @@
</span><span class="cx"> if ( is_array( $extra_args ) )
</span><span class="cx"> $args = array_merge( $args, $extra_args );
</span><span class="cx">
</span><del>- parent::_js_vars( $args );
</del><ins>+ printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", json_encode( $args ) );
+ parent::_js_vars();
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>