<!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>[34383] trunk/src/wp-admin/includes: List Tables: when comparing string literals (non-numeric in nature) against vars, strict comparison can/should be used.</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/34383">34383</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/34383","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-22 06:05:39 +0000 (Tue, 22 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'>List Tables: when comparing string literals (non-numeric in nature) against vars, strict comparison can/should be used.
Props wonderboymusic, Viper007Bond.
Fixes <a href="https://core.trac.wordpress.org/ticket/21249">#21249</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></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-comments-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-comments-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,10 +183,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function no_items() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $comment_status;
</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 ( 'moderated' == $comment_status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'moderated' === $comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'No comments awaiting moderation.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'No comments found.' );
</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><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">@@ -218,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = add_query_arg( 'comment_type', $comment_type, $link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $stati as $status => $label ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ( $status == $comment_status ) ? ' class="current"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = ( $status === $comment_status ) ? ' class="current"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $num_comments->$status ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $num_comments->$status = 10;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,10 +265,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['spam'] = _x( 'Mark as Spam', 'comment' );
</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 ( 'trash' == $comment_status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['untrash'] = __( 'Restore' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( 'spam' == $comment_status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'spam' === $comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['unspam'] = _x( 'Not Spam', 'comment' );
</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><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS )
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['delete'] = __( 'Delete Permanently' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'top' == $which ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'top' === $which ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="filter-by-comment-type"><?php _e( 'Filter by comment type' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select id="filter-by-comment-type" name="comment_type">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,9 +323,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
</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 ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
</ins><span class="cx" style="display: block; padding: 0 10px"> submit_button( $title, 'apply', 'delete_all', false );
</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">@@ -511,9 +513,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Not looking at all comments.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $comment_status && 'all' != $comment_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'approved' == $the_comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'approved' === $the_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=unapproved' class='vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'unapproved' == $the_comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'unapproved' === $the_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=approved' class='vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,23 +523,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</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 ( 'spam' != $the_comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'spam' !== $the_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'spam' == $the_comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'spam' === $the_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['unspam'] = "<a href='$unspam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1' class='vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</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 ( 'trash' == $the_comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $the_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['untrash'] = "<a href='$untrash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1' class='vim-z vim-destructive'>" . __( 'Restore' ) . '</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 ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::delete=1' class='delete vim-d vim-destructive'>" . __( 'Delete Permanently' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</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 ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = "<a href='comment.php?action=editcomment&c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" title="%s" href="#">%s</a>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,12 +556,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= '<div class="row-actions">';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $actions as $action => $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ++$i;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reply and quickedit need a hide-if-no-js span when not added with ajax
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'reply' === $action || 'quickedit' === $action ) && ! defined('DOING_AJAX') )
</ins><span class="cx" style="display: block; padding: 0 10px"> $action .= ' hide-if-no-js';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $action .= ' approve';
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -669,7 +671,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip = get_comment_author_IP( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $author_ip ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), 'edit-comments.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'spam' == $comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'spam' === $comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<a href="%s">%s</a>', esc_url( $author_ip_url ), $author_ip );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,7 +712,7 @@
</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"> echo '<div class="response-links">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $thumb;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo $post_link;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></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-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-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,11 +283,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int Number of items that correspond to the given pagination argument.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_pagination_arg( $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $key )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->get_pagenum();
</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 ( isset( $this->_pagination_args[$key] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $this->_pagination_args[$key] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->_pagination_args[$key];
</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><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">@@ -440,7 +442,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->_actions as $name => $title ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = 'edit' == $name ? ' class="hide-if-no-js"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = 'edit' === $name ? ' class="hide-if-no-js"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "\t<option value='$name'$class>$title</option>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,7 +600,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->modes as $mode => $title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array( 'view-' . $mode );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $current_mode == $mode )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $current_mode === $mode )
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'current';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> "<a href='%s' class='%s' id='view-switch-$mode'><span class='screen-reader-text'>%s</span></a>\n",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,7 +784,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'bottom' == $which ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'bottom' === $which ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html_current_page = $current;
</span><span class="cx" style="display: block; padding: 0 10px"> $total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input">';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1025,7 +1027,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $current_orderby = '';
</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 ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_order = 'desc';
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $current_order = 'asc';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1044,7 +1046,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'hidden';
</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 ( 'cb' == $column_key )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'cb' === $column_key )
</ins><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'check-column';
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'num';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1056,8 +1058,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $sortable[$column_key] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $orderby, $desc_first ) = $sortable[$column_key];
</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_orderby == $orderby ) {
- $order = 'asc' == $current_order ? 'desc' : 'asc';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $current_orderby === $orderby ) {
+ $order = 'asc' === $current_order ? 'desc' : 'asc';
</ins><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'sorted';
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = $current_order;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1136,9 +1138,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $which
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function display_tablenav( $which ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'top' == $which )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'top' === $which ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'bulk-' . $this->_args['plural'] );
</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"> if ( $this->has_items() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="tablenav <?php echo esc_attr( $which ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1247,7 +1249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes = "class='$classes' $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 ( 'cb' == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'cb' === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<th scope="row" class="check-column">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo $this->column_cb( $item );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</th>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1285,7 +1287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The row actions HTML, or an empty string if the current column is the primary column.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function handle_row_actions( $item, $column_name, $primary ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $column_name == $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
</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></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></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-media-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-media-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' == $_REQUEST['attachment-filter'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ false
</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"> $type_links[$mime_type] = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,13 +285,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'category' == $taxonomy )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $column_key = 'categories';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( 'post_tag' == $taxonomy )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_tag' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $column_key = 'tags';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $column_key = 'taxonomy-' . $taxonomy;
</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"> $posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
</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">@@ -426,7 +426,7 @@
</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_date( $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '0000-00-00 00:00:00' == $post->post_date ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0000-00-00 00:00:00' === $post->post_date ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $h_time = __( 'Unpublished' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $m_time = $post->post_date;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,9 +526,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $column_name Current column name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_default( $post, $column_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'categories' == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'categories' === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = 'category';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'tags' == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'tags' === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = 'post_tag';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = substr( $column_name, 9 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,7 +589,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> while ( have_posts() ) : the_post();
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> ( $this->is_trash && $post->post_status != 'trash' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || ( ! $this->is_trash && $post->post_status == 'trash' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || ( ! $this->is_trash && $post->post_status === 'trash' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></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-sites-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-sites-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,24 +122,24 @@
</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"> $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $order_by == 'registered' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $order_by === 'registered' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query .= ' ORDER BY registered ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $order_by == 'lastupdated' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $order_by === 'lastupdated' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query .= ' ORDER BY last_updated ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $order_by == 'blogname' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $order_by === 'blogname' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query .= ' ORDER BY domain ';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $query .= ' ORDER BY path ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $order_by == 'blog_id' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $order_by === 'blog_id' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query .= ' ORDER BY blog_id ';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $order_by = null;
</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"> if ( isset( $order_by ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $order = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
</ins><span class="cx" style="display: block; padding: 0 10px"> $query .= $order;
</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">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::pagination( $which );
</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 ( 'top' == $which )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'top' === $which )
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->view_switcher( $mode );
</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">@@ -320,13 +320,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_lastupdated( $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $mode;
</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 ( 'list' == $mode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' === $mode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d g:i:s 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">- echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ( $blog['last_updated'] === '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
</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">@@ -340,13 +340,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_registered( $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $mode;
</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 ( 'list' == $mode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' === $mode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d g:i:s 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 ( $blog['registered'] == '0000-00-00 00:00:00' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $blog['registered'] === '0000-00-00 00:00:00' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '—';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo mysql2date( $date, $blog['registered'] );
</span></span></pre></div>
<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-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page = $this->get_pagenum();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->is_site_themes = ( 'site-themes-network' == $this->screen->id ) ? true : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
</ins><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 class="cx" style="display: block; padding: 0 10px"> $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,9 +145,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = ucfirst( $orderby );
</span><span class="cx" style="display: block; padding: 0 10px"> $order = strtoupper( $order );
</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 ( $orderby == 'Name' ) {
- if ( 'ASC' == $order )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $orderby === 'Name' ) {
+ if ( 'ASC' === $order ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->items = array_reverse( $this->items );
</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"> uasort( $this->items, array( $this, '_order_callback' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $a == $b )
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</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 ( 'DESC' == $order )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'DESC' === $order )
</ins><span class="cx" style="display: block; padding: 0 10px"> return ( $a < $b ) ? 1 : -1;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> return ( $a < $b ) ? -1 : 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'search' != $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( add_query_arg('theme_status', $type, $url) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $type == $status ) ? ' class="current"' : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $type === $status ) ? ' class="current"' : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( $text, number_format_i18n( $count ) )
</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">@@ -459,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_description( $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $status, $totals;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme->errors() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pre = $status === 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
</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="trunksrcwpadminincludesclasswpmsuserslisttablephp"></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-users-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-users-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['search'] = '*' . $args['search'] . '*';
</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 ( $role == 'super' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $role === 'super' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $logins = implode( "', '", get_super_admins() );
</span><span class="cx" style="display: block; padding: 0 10px"> $args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class = $role != 'super' ? ' class="current"' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $role_links = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $role_links['all'] = "<a href='" . network_admin_url('users.php') . "'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = $role == 'super' ? ' class="current"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = $role === 'super' ? ' class="current"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $role_links['super'] = "<a href='" . network_admin_url('users.php?role=super') . "'$class>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $role_links;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,8 +137,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::pagination ( $which );
</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 ( 'top' == $which )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'top' === $which ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->view_switcher( $mode );
</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><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">@@ -268,7 +269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_registered( $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $mode;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'list' == $mode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' === $mode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d g:i:s a' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- $path = ( $val->path == '/' ) ? '' : $val->path;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = ( $val->path === '/' ) ? '' : $val->path;
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="site-' . $val->site_id . '" >';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo ' <small class="row-actions">';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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-plugin-install-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-plugin-install-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,8 +77,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // These are the tabs which are shown on the page
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs = array();
</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 ( 'search' == $tab )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'search' === $tab ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tabs['search'] = __( 'Search Results' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $tabs['featured'] = _x( 'Featured', 'Plugin Installer' );
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['popular'] = _x( 'Popular', 'Plugin Installer' );
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['recommended'] = _x( 'Recommended', 'Plugin Installer' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +239,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $display_tabs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tabs as $action => $text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ( $action == $tab ) ? ' current' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = ( $action === $tab ) ? ' current' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $href = self_admin_url('plugin-install.php?tab=' . $action);
</span><span class="cx" style="display: block; padding: 0 10px"> $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +311,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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 ( 'top' == $which ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'top' === $which ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_referer_field();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="tablenav top">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</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 ( 'DESC' == $this->order ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'DESC' === $this->order ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return ( $a < $b ) ? 1 : -1;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return ( $a < $b ) ? -1 : 1;
</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-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $a == $b )
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</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 ( 'DESC' == $order ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'DESC' === $order ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return strcasecmp( $b, $a );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return strcasecmp( $a, $b );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,10 +337,10 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'search' != $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'search' !== $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg('plugin_status', $type, 'plugins.php'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $type == $status ) ? ' class="current"' : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $type === $status ) ? ' class="current"' : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( $text, number_format_i18n( $count ) )
</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">@@ -400,13 +400,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="alignleft actions">';
</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 ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' == $status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( 'top' == $which && 'mustuse' == $status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'top' === $which && 'mustuse' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( 'top' == $which && 'dropins' == $status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'top' === $which && 'dropins' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the <code>%s</code> directory that replace WordPress functionality when present.' ), str_replace( ABSPATH, '', WP_CONTENT_DIR ) ) . '</p>';
</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"> echo '</div>';
</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">@@ -458,9 +458,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete' => '',
</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 ( 'mustuse' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'mustuse' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_active = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'dropins' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'dropins' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dropins = _get_dropins();
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_name = $plugin_file;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin_file != $plugin_data['Name'] )
</span></span></pre></div>
<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-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_GET['author'] = get_current_user_id();
</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 ( 'post' == $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $avail_post_stati = wp_edit_posts_query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' == $wp_query->query['orderby'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = $this->screen->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,13 +161,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_pages = ceil( $total_items / $per_page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['mode'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = $_REQUEST['mode'] == 'excerpt' ? 'excerpt' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px"> set_user_setting ( 'posts_list_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = get_user_setting ( 'posts_list_mode', 'list' );
</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">- $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] == 'trash';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_pagination_args( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'total_items' => $total_items,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function no_items() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_post_type_object( $this->screen->post_type )->labels->not_found;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function is_base_request() {
</span><span class="cx" style="display: block; padding: 0 10px"> $vars = $_GET;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $vars['paged'] );
</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"> if ( empty( $vars ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 1 === count( $vars ) && ! empty( $vars['post_type'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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 ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = 'current';
</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">@@ -409,7 +409,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'top' == $which && !is_singular() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'top' === $which && !is_singular() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->months_dropdown( $this->screen->post_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::pagination( $which );
</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 ( 'top' == $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'top' === $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->view_switcher( $mode );
</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">@@ -519,9 +519,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'category' == $taxonomy )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'category' === $taxonomy )
</ins><span class="cx" style="display: block; padding: 0 10px"> $column_key = 'categories';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( 'post_tag' == $taxonomy )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( 'post_tag' === $taxonomy )
</ins><span class="cx" style="display: block; padding: 0 10px"> $column_key = 'tags';
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $column_key = 'taxonomy-' . $taxonomy;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_columns['date'] = __( 'Date' );
</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 ( 'page' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post_type ) {
</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"> * Filter the columns displayed in the Pages list table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -900,7 +900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="locked-info"><span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span></div>\n";
</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 ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> the_excerpt();
</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">@@ -920,7 +920,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_date( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $mode;
</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 ( '0000-00-00 00:00:00' == $post->post_date ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0000-00-00 00:00:00' === $post->post_date ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $t_time = $h_time = __( 'Unpublished' );
</span><span class="cx" style="display: block; padding: 0 10px"> $time_diff = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,9 +937,9 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'publish' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'Published' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'future' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'future' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $time_diff > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -949,7 +949,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Last Modified' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<br />';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'excerpt' == $mode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'excerpt' === $mode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the published time of the post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1018,9 +1018,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $column_name The current column name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_default( $post, $column_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'categories' == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'categories' === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = 'category';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'tags' == $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'tags' === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = 'post_tag';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = substr( $column_name, 9 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1172,11 +1172,11 @@
</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"> if ( current_user_can( 'delete_post', $post->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trash' == $post->post_status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $post->post_status )
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['untrash'] = "<a title='" . esc_attr__( 'Restore this item from the Trash' ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( EMPTY_TRASH_DAYS )
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash' ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $post->post_status || !EMPTY_TRASH_DAYS )
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently' ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
</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">@@ -1271,7 +1271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $flat_taxonomies[] = $taxonomy;
</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">- $m = ( isset( $mode ) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px"> $can_publish = current_user_can( $post_type_object->cap->publish_posts );
</span><span class="cx" style="display: block; padding: 0 10px"> $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1379,7 +1379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="<?php echo ( $taxonomy->name == 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul class="cat-checklist <?php echo esc_attr( $taxonomy->name )?>-checklist">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1442,7 +1442,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // !$bulk
</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 ( 'page' == $screen->post_type ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $screen->post_type ) :
</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"> <label>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1542,7 +1542,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $bulk ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></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-terms-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-terms-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_items() {
</span><span class="cx" style="display: block; padding: 0 10px"> $tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
</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 ( 'post_tag' == $this->screen->taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_tag' === $this->screen->taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the number of terms displayed per page for the Tags list table.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $tags_per_page Number of tags to be displayed. Default 20.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'category' == $this->screen->taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'category' === $this->screen->taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the number of terms displayed per page for the Categories list table.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function current_action() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'bulk-delete';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return parent::current_action();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => __( '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">- if ( 'link_category' == $this->screen->taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'link_category' === $this->screen->taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $columns['links'] = __( 'Links' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $columns['posts'] = _x( 'Count', 'Number/count of items' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post' != $this->screen->post_type )
</span><span class="cx" style="display: block; padding: 0 10px"> $args['post_type'] = $this->screen->post_type;
</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 ( 'attachment' == $this->screen->post_type )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $this->screen->post_type )
</ins><span class="cx" style="display: block; padding: 0 10px"> return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></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-theme-install-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-theme-install-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // These are the tabs which are shown on the page,
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['dashboard'] = __( 'Search' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'search' == $tab )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'search' === $tab )
</ins><span class="cx" style="display: block; padding: 0 10px"> $tabs['search'] = __( 'Search Results' );
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['upload'] = __( 'Upload' );
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['featured'] = _x( 'Featured', 'themes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $display_tabs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tabs as $action => $text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ( $action == $tab ) ? ' class="current"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = ( $action === $tab ) ? ' class="current"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $href = self_admin_url('theme-install.php?tab=' . $action);
</span><span class="cx" style="display: block; padding: 0 10px"> $display_tabs['theme-install-'.$action] = "<a href='$href'$class>$text</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></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-users-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-users-list-table.php 2015-09-22 05:44:45 UTC (rev 34382)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-09-22 06:05:39 UTC (rev 34383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
</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">- $this->is_site_users = 'site-users-network' == $this->screen->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_site_users = 'site-users-network' === $this->screen->id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_users )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</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 ( $this_role == $role ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this_role === $role ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = ' class="current"';
</span><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>