<!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>[34084] trunk/src/wp-admin/includes/class-wp-posts-list-table.php: `WP_Posts_List_Table`: there are a cadre of `edit.php` URLs that are generated by string-building instead of using our handy functions.</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/34084">34084</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/34084","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-09-12 17:12:25 +0000 (Sat, 12 Sep 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'>`WP_Posts_List_Table`: there are a cadre of `edit.php` URLs that are generated by string-building instead of using our handy functions. Create a helper method, `->get_edit_link()` that standardizes the generation and escaping of these URLs.
Props BdN3504 for the initial patch on the ticket.
Fixes <a href="https://core.trac.wordpress.org/ticket/32376">#32376</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></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-posts-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-posts-list-table.php 2015-09-12 16:03:17 UTC (rev 34083)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2015-09-12 17:12:25 UTC (rev 34084)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,10 +191,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 1 === count( $_GET ) && ! empty( $_GET['post_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->screen->post_type === $_GET['post_type'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return 1 === count( $_GET ) && ! empty( $_GET['mode'] );
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Helper to create links to `edit.php` with params
</ins><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.4.0
+ *
+ * @return string The formatted link string.
+ */
+ protected function get_edit_link( $args, $label, $class = '' ) {
+ $url = add_query_arg( $args, 'edit.php' );
+
+ $class_html = '';
+ if ( ! empty( $class ) ) {
+ $class_html = sprintf(
+ ' class="%s"',
+ esc_attr( $class )
+ );
+ }
+
+ return sprintf(
+ '<a href="%s"%s>%s</a>',
+ esc_url( $url ),
+ $class_html,
+ $label
+ );
+ }
+
+ /**
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global array $locked_post_status This seems to be deprecated.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $avail_post_stati
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,15 +238,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $status_links = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $num_posts = wp_count_posts( $post_type, 'readable' );
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allposts = '';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user_id = get_current_user_id();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $all_args = array( 'post_type' => $post_type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->user_posts_count ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) )
- $class = ' class="current"';
- $status_links['mine'] = "<a href='edit.php?post_type=$post_type&author=$current_user_id'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $this->user_posts_count, 'posts' ), number_format_i18n( $this->user_posts_count ) ) . '</a>';
- $allposts = '&all_posts=1';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) ) {
+ $class = 'current';
+ }
+
+ $mine_args = array(
+ 'post_type' => $post_type,
+ 'author' => $current_user_id
+ );
+
+ $mine_inner_html = sprintf(
+ _nx(
+ 'Mine <span class="count">(%s)</span>',
+ 'Mine <span class="count">(%s)</span>',
+ $this->user_posts_count,
+ 'posts'
+ ),
+ number_format_i18n( $this->user_posts_count )
+ );
+
+ $status_links['mine'] = $this->get_edit_link( $mine_args, $mine_inner_html, $class );
+
+ $all_args['all_posts'] = 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</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">@@ -229,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_posts -= $num_posts->$state;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $class ) && ( ( $this->is_base_request() && ! $this->user_posts_count ) || isset( $_REQUEST['all_posts'] ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ' class="current"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = 'current';
</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"> $all_inner_html = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,30 +288,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $total_posts )
</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">- $status_links['all'] = "<a href='edit.php?post_type=$post_type{$allposts}'$class>" . $all_inner_html . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status_links['all'] = $this->get_edit_link( $all_args, $all_inner_html, $class );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $status_name = $status->name;
</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 ( !in_array( $status_name, $avail_post_stati ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $status_name, $avail_post_stati ) || empty( $num_posts->$status_name ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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 ( empty( $num_posts->$status_name ) )
- continue;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] ) {
+ $class = 'current';
+ }
</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 ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] )
- $class = ' class="current"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status_args = array(
+ 'post_status' => $status_name,
+ 'post_type' => $post_type,
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status_links[$status_name] = "<a href='edit.php?post_status=$status_name&post_type=$post_type'$class>" . sprintf( translate_nooped_plural( $status->label_count, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status_label = sprintf(
+ translate_nooped_plural( $status->label_count, $num_posts->$status_name ),
+ number_format_i18n( $num_posts->$status_name )
+ );
+
+ $status_links[ $status_name ] = $this->get_edit_link( $status_args, $status_label, $class );
</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"> if ( ! empty( $this->sticky_posts_count ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ! empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = ! empty( $_REQUEST['show_sticky'] ) ? 'current' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sticky_link = array( 'sticky' => "<a href='edit.php?post_type=$post_type&show_sticky=1'$class>" . sprintf( _nx( 'Sticky <span class="count">(%s)</span>', 'Sticky <span class="count">(%s)</span>', $this->sticky_posts_count, 'posts' ), number_format_i18n( $this->sticky_posts_count ) ) . '</a>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sticky_args = array(
+ 'post_type' => $post_type,
+ 'show_sticky' => 1
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sticky_inner_html = sprintf(
+ _nx(
+ 'Sticky <span class="count">(%s)</span>',
+ 'Sticky <span class="count">(%s)</span>',
+ $this->sticky_posts_count,
+ 'posts'
+ ),
+ number_format_i18n( $this->sticky_posts_count )
+ );
+
+ $sticky_link = array(
+ 'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Sticky comes after Publish, or if not listed, after All.
</span><span class="cx" style="display: block; padding: 0 10px"> $split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $status_links = array_merge( array_slice( $status_links, 0, $split ), $sticky_link, array_slice( $status_links, $split ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,7 +832,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $label = get_post_format_string( $format );
</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 '<a href="' . esc_url( add_query_arg( array( 'post_format' => $format, 'post_type' => $post->post_type ), 'edit.php' ) ) . '" class="post-state-format post-format-icon post-format-' . $format . '" title="' . $label . '">' . $label . ":</a> ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $format_class = 'post-state-format post-format-icon post-format-' . $format;
+
+ $format_args = array(
+ 'post_format' => $format,
+ 'post_type' => $post->post_type
+ );
+
+ echo $this->get_edit_link( $format_args, $label . ':', $format_class );
</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"> $can_edit_post = current_user_can( 'edit_post', $post->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,10 +974,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post The current WP_Post object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_author( $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( '<a href="%s">%s</a>',
- esc_url( add_query_arg( array( 'post_type' => $post->post_type, 'author' => get_the_author_meta( 'ID' ) ), 'edit.php' )),
- get_the_author()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array(
+ 'post_type' => $post->post_type,
+ 'author' => get_the_author_meta( 'ID' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $this->get_edit_link( $args, get_the_author() );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,10 +1017,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_in_term_qv['term'] = $t->slug;
</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">- $out[] = sprintf( '<a href="%s">%s</a>',
- esc_url( add_query_arg( $posts_in_term_qv, 'edit.php' ) ),
- esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $label = esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) );
+ $out[] = $this->get_edit_link( $posts_in_term_qv, $label );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: used between list items, there is a space after the comma */
</span><span class="cx" style="display: block; padding: 0 10px"> echo join( __( ', ' ), $out );
</span></span></pre>
</div>
</div>
</body>
</html>