Changeset 34383

Timestamp:

09/22/2015 06:05:39 AM (9 years ago)

Author:

wonderboymusic

Message:

List Tables: when comparing string literals (non-numeric in nature) against vars, strict comparison can/should be used.

Props wonderboymusic, Viper007Bond.
Fixes #21249.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-comments-list-table.php (modified) (11 diffs)
• class-wp-list-table.php (modified) (10 diffs)
• class-wp-media-list-table.php (modified) (6 diffs)
• class-wp-ms-sites-list-table.php (modified) (8 diffs)
• class-wp-ms-themes-list-table.php (modified) (5 diffs)
• class-wp-ms-users-list-table.php (modified) (5 diffs)
• class-wp-plugin-install-list-table.php (modified) (4 diffs)
• class-wp-plugins-list-table.php (modified) (4 diffs)
• class-wp-posts-list-table.php (modified) (21 diffs)
• class-wp-terms-list-table.php (modified) (5 diffs)
• class-wp-theme-install-list-table.php (modified) (2 diffs)
• class-wp-users-list-table.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -184 +184 @@
         global $comment_status;
 
-        if ( 'moderated' == $comment_status )
+        if ( 'moderated' === $comment_status ) {
             _e( 'No comments awaiting moderation.' );
-        else
+        } else {
             _e( 'No comments found.' );
+        }
     }
 
@@ -219 +220 @@
 
         foreach ( $stati as $status => $label ) {
-            $class = ( $status == $comment_status ) ? ' class="current"' : '';
+            $class = ( $status === $comment_status ) ? ' class="current"' : '';
 
             if ( !isset( $num_comments->$status ) )
@@ -265 +266 @@
             $actions['spam'] = _x( 'Mark as Spam', 'comment' );
 
-        if ( 'trash' == $comment_status )
+        if ( 'trash' === $comment_status ) {
             $actions['untrash'] = __( 'Restore' );
-        elseif ( 'spam' == $comment_status )
+        } elseif ( 'spam' === $comment_status ) {
             $actions['unspam'] = _x( 'Not Spam', 'comment' );
+        }
 
         if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS )
@@ -290 +292 @@
         <div class="alignleft actions">
 <?php
-        if ( 'top' == $which ) {
+        if ( 'top' === $which ) {
 ?>
             <label class="screen-reader-text" for="filter-by-comment-type"><?php _e( 'Filter by comment type' ); ?></label>
@@ -322 +324 @@
         }
 
-        if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) {
+        if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) ) {
             wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
-            $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
+            $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
             submit_button( $title, 'apply', 'delete_all', false );
         }
@@ -512 +514 @@
         // Not looking at all comments.
         if ( $comment_status && 'all' != $comment_status ) {
-            if ( 'approved' == $the_comment_status ) {
+            if ( 'approved' === $the_comment_status ) {
                 $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved' class='vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-            } elseif ( 'unapproved' == $the_comment_status ) {
+            } elseif ( 'unapproved' === $the_comment_status ) {
                 $actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved' class='vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
             }
@@ -522 +524 @@
         }
 
-        if ( 'spam' != $the_comment_status ) {
+        if ( 'spam' !== $the_comment_status ) {
             $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>';
-        } elseif ( 'spam' == $the_comment_status ) {
+        } elseif ( 'spam' === $the_comment_status ) {
             $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>';
         }
 
-        if ( 'trash' == $the_comment_status ) {
+        if ( 'trash' === $the_comment_status ) {
             $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>';
         }
 
-        if ( 'spam' == $the_comment_status || 'trash' == $the_comment_status || !EMPTY_TRASH_DAYS ) {
+        if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) {
             $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>';
         } else {
@@ -538 +540 @@
         }
 
-        if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
+        if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
             $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
 
@@ -555 +557 @@
         foreach ( $actions as $action => $link ) {
             ++$i;
-            ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
+            ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
             // Reply and quickedit need a hide-if-no-js span when not added with ajax
-            if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') )
+            if ( ( 'reply' === $action || 'quickedit' === $action ) && ! defined('DOING_AJAX') )
                 $action .= ' hide-if-no-js';
-            elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) {
+            elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
                 if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
                     $action .= ' approve';
@@ -670 +672 @@
             if ( $author_ip ) {
                 $author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), 'edit-comments.php' );
-                if ( 'spam' == $comment_status ) {
+                if ( 'spam' === $comment_status ) {
                     $author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
                 }
@@ -711 +713 @@
 
         echo '<div class="response-links">';
-        if ( 'attachment' == $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) {
+        if ( 'attachment' === $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) {
             echo $thumb;
         }

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -284 +284 @@
      */
     public function get_pagination_arg( $key ) {
-        if ( 'page' == $key )
+        if ( 'page' === $key ) {
             return $this->get_pagenum();
-
-        if ( isset( $this->_pagination_args[$key] ) )
+        }
+
+        if ( isset( $this->_pagination_args[$key] ) ) {
             return $this->_pagination_args[$key];
+        }
     }
 
@@ -441 +443 @@
 
         foreach ( $this->_actions as $name => $title ) {
-            $class = 'edit' == $name ? ' class="hide-if-no-js"' : '';
+            $class = 'edit' === $name ? ' class="hide-if-no-js"' : '';
 
             echo "\t<option value='$name'$class>$title</option>\n";
@@ -599 +601 @@
             foreach ( $this->modes as $mode => $title ) {
                 $classes = array( 'view-' . $mode );
-                if ( $current_mode == $mode )
+                if ( $current_mode === $mode )
                     $classes[] = 'current';
                 printf(
@@ -783 +785 @@
         }
 
-        if ( 'bottom' == $which ) {
+        if ( 'bottom' === $which ) {
             $html_current_page  = $current;
             $total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input">';
@@ -1026 +1028 @@
             $current_orderby = '';
 
-        if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
+        if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] )
             $current_order = 'desc';
         else
@@ -1045 +1047 @@
             }
 
-            if ( 'cb' == $column_key )
+            if ( 'cb' === $column_key )
                 $class[] = 'check-column';
             elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
@@ -1057 +1059 @@
                 list( $orderby, $desc_first ) = $sortable[$column_key];
 
-                if ( $current_orderby == $orderby ) {
-                    $order = 'asc' == $current_order ? 'desc' : 'asc';
+                if ( $current_orderby === $orderby ) {
+                    $order = 'asc' === $current_order ? 'desc' : 'asc';
                     $class[] = 'sorted';
                     $class[] = $current_order;
@@ -1137 +1139 @@
      */
     protected function display_tablenav( $which ) {
-        if ( 'top' == $which )
+        if ( 'top' === $which ) {
             wp_nonce_field( 'bulk-' . $this->_args['plural'] );
-
+        }
         if ( $this->has_items() ) : ?>
     <div class="tablenav <?php echo esc_attr( $which ); ?>">
@@ -1248 +1250 @@
             $attributes = "class='$classes' $data";
 
-            if ( 'cb' == $column_name ) {
+            if ( 'cb' === $column_name ) {
                 echo '<th scope="row" class="check-column">';
                 echo $this->column_cb( $item );
@@ -1286 +1288 @@
      */
     protected function handle_row_actions( $item, $column_name, $primary ) {
-        return $column_name == $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
+        return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
     }
 

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -66 +66 @@
         list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
 
-        $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' == $_REQUEST['attachment-filter'];
+        $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
 
         $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
@@ -106 +106 @@
                     wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
                 true,
-                false   
+                false
             );
 
@@ -286 +286 @@
 
         foreach ( $taxonomies as $taxonomy ) {
-            if ( 'category' == $taxonomy )
+            if ( 'category' === $taxonomy ) {
                 $column_key = 'categories';
-            elseif ( 'post_tag' == $taxonomy )
+            } elseif ( 'post_tag' === $taxonomy ) {
                 $column_key = 'tags';
-            else
+            } else {
                 $column_key = 'taxonomy-' . $taxonomy;
-
+            }
             $posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
         }
@@ -427 +427 @@
      */
     public function column_date( $post ) {
-        if ( '0000-00-00 00:00:00' == $post->post_date ) {
+        if ( '0000-00-00 00:00:00' === $post->post_date ) {
             $h_time = __( 'Unpublished' );
         } else {
@@ -527 +527 @@
      */
     public function column_default( $post, $column_name ) {
-        if ( 'categories' == $column_name ) {
+        if ( 'categories' === $column_name ) {
             $taxonomy = 'category';
-        } elseif ( 'tags' == $column_name ) {
+        } elseif ( 'tags' === $column_name ) {
             $taxonomy = 'post_tag';
         } elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
@@ -590 +590 @@
             if (
                 ( $this->is_trash && $post->post_status != 'trash' )
-                || ( ! $this->is_trash && $post->post_status == 'trash' )
+                || ( ! $this->is_trash && $post->post_status === 'trash' )
             ) {
                 continue;

trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -123 +123 @@
 
         $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-        if ( $order_by == 'registered' ) {
+        if ( $order_by === 'registered' ) {
             $query .= ' ORDER BY registered ';
-        } elseif ( $order_by == 'lastupdated' ) {
+        } elseif ( $order_by === 'lastupdated' ) {
             $query .= ' ORDER BY last_updated ';
-        } elseif ( $order_by == 'blogname' ) {
+        } elseif ( $order_by === 'blogname' ) {
             if ( is_subdomain_install() ) {
                 $query .= ' ORDER BY domain ';
@@ -133 +133 @@
                 $query .= ' ORDER BY path ';
             }
-        } elseif ( $order_by == 'blog_id' ) {
+        } elseif ( $order_by === 'blog_id' ) {
             $query .= ' ORDER BY blog_id ';
         } else {
@@ -140 +140 @@
 
         if ( isset( $order_by ) ) {
-            $order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+            $order = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
             $query .= $order;
         }
@@ -191 +191 @@
         parent::pagination( $which );
 
-        if ( 'top' == $which )
+        if ( 'top' === $which )
             $this->view_switcher( $mode );
     }
@@ -321 +321 @@
         global $mode;
 
-        if ( 'list' == $mode ) {
+        if ( 'list' === $mode ) {
             $date = __( 'Y/m/d' );
         } else {
@@ -327 +327 @@
         }
 
-        echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+        echo ( $blog['last_updated'] === '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
     }
 
@@ -341 +341 @@
         global $mode;
 
-        if ( 'list' == $mode ) {
+        if ( 'list' === $mode ) {
             $date = __( 'Y/m/d' );
         } else {
@@ -347 +347 @@
         }
 
-        if ( $blog['registered'] == '0000-00-00 00:00:00' ) {
+        if ( $blog['registered'] === '0000-00-00 00:00:00' ) {
             echo '—';
         } else {

trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -42 +42 @@
         $page = $this->get_pagenum();
 
-        $this->is_site_themes = ( 'site-themes-network' == $this->screen->id ) ? true : false;
+        $this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
 
         if ( $this->is_site_themes )
@@ -146 +146 @@
             $order = strtoupper( $order );
 
-            if ( $orderby == 'Name' ) {
-                if ( 'ASC' == $order )
+            if ( $orderby === 'Name' ) {
+                if ( 'ASC' === $order ) {
                     $this->items = array_reverse( $this->items );
+                }
             } else {
                 uasort( $this->items, array( $this, '_order_callback' ) );
@@ -207 +208 @@
             return 0;
 
-        if ( 'DESC' == $order )
+        if ( 'DESC' === $order )
             return ( $a < $b ) ? 1 : -1;
         else
@@ -297 +298 @@
                 $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
                     esc_url( add_query_arg('theme_status', $type, $url) ),
-                    ( $type == $status ) ? ' class="current"' : '',
+                    ( $type === $status ) ? ' class="current"' : '',
                     sprintf( $text, number_format_i18n( $count ) )
                 );
@@ -460 +461 @@
         global $status, $totals;
         if ( $theme->errors() ) {
-            $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
+            $pre = $status === 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
             echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
         }

trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -50 +50 @@
         }
 
-        if ( $role == 'super' ) {
+        if ( $role === 'super' ) {
             $logins = implode( "', '", get_super_admins() );
             $args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" );
@@ -123 +123 @@
         $role_links = array();
         $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>';
-        $class = $role == 'super' ? ' class="current"' : '';
+        $class = $role === 'super' ? ' class="current"' : '';
         $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>';
 
@@ -138 +138 @@
         parent::pagination ( $which );
 
-        if ( 'top' == $which )
+        if ( 'top' === $which ) {
             $this->view_switcher( $mode );
+        }
     }
 
@@ -269 +270 @@
     public function column_registered( $user ) {
         global $mode;
-        if ( 'list' == $mode ) {
+        if ( 'list' === $mode ) {
             $date = __( 'Y/m/d' );
         } else {
@@ -312 +313 @@
             }
 
-            $path   = ( $val->path == '/' ) ? '' : $val->path;
+            $path   = ( $val->path === '/' ) ? '' : $val->path;
             echo '<span class="site-' . $val->site_id . '" >';
             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>';

trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -78 +78 @@
         $tabs = array();
 
-        if ( 'search' == $tab )
+        if ( 'search' === $tab ) {
             $tabs['search'] = __( 'Search Results' );
+        }
         $tabs['featured']  = _x( 'Featured', 'Plugin Installer' );
         $tabs['popular']   = _x( 'Popular', 'Plugin Installer' );
@@ -239 +240 @@
         $display_tabs = array();
         foreach ( (array) $tabs as $action => $text ) {
-            $class = ( $action == $tab ) ? ' current' : '';
+            $class = ( $action === $tab ) ? ' current' : '';
             $href = self_admin_url('plugin-install.php?tab=' . $action);
             $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
@@ -311 +312 @@
         }
 
-        if ( 'top' ==  $which ) {
+        if ( 'top' === $which ) {
             wp_referer_field();
         ?>
@@ -368 +369 @@
         }
 
-        if ( 'DESC' == $this->order ) {
+        if ( 'DESC' === $this->order ) {
             return ( $a < $b ) ? 1 : -1;
         } else {

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -258 +258 @@
             return 0;
 
-        if ( 'DESC' == $order ) {
+        if ( 'DESC' === $order ) {
             return strcasecmp( $b, $a );
         } else {
@@ -338 +338 @@
             }
 
-            if ( 'search' != $type ) {
+            if ( 'search' !== $type ) {
                 $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
                     add_query_arg('plugin_status', $type, 'plugins.php'),
-                    ( $type == $status ) ? ' class="current"' : '',
+                    ( $type === $status ) ? ' class="current"' : '',
                     sprintf( $text, number_format_i18n( $count ) )
                     );
@@ -401 +401 @@
         echo '<div class="alignleft actions">';
 
-        if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' == $status )
+        if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' === $status ) {
             submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
-        elseif ( 'top' == $which && 'mustuse' == $status )
+        } elseif ( 'top' === $which && 'mustuse' === $status ) {
             echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
-        elseif ( 'top' == $which && 'dropins' == $status )
+        } elseif ( 'top' === $which && 'dropins' === $status ) {
             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>';
-
+        }
         echo '</div>';
     }
@@ -459 +459 @@
         );
 
-        if ( 'mustuse' == $context ) {
+        if ( 'mustuse' === $context ) {
             $is_active = true;
-        } elseif ( 'dropins' == $context ) {
+        } elseif ( 'dropins' === $context ) {
             $dropins = _get_dropins();
             $plugin_name = $plugin_file;

trunk/src/wp-admin/includes/class-wp-posts-list-table.php

@@ -95 +95 @@
         }
 
-        if ( 'post' == $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
+        if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
             $sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
             $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 ) );
@@ -132 +132 @@
         $avail_post_stati = wp_edit_posts_query();
 
-        $this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' == $wp_query->query['orderby'] );
+        $this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
 
         $post_type = $this->screen->post_type;
@@ -162 +162 @@
 
         if ( ! empty( $_REQUEST['mode'] ) ) {
-            $mode = $_REQUEST['mode'] == 'excerpt' ? 'excerpt' : 'list';
+            $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
             set_user_setting ( 'posts_list_mode', $mode );
         } else {
@@ -168 +168 @@
         }
 
-        $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] == 'trash';
+        $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
 
         $this->set_pagination_args( array(
@@ -189 +189 @@
      */
     public function no_items() {
-        if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
+        if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
             echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
         else
@@ -205 +205 @@
         $vars = $_GET;
         unset( $vars['paged'] );
-        
+
         if ( empty( $vars ) ) {
             return true;
@@ -327 +327 @@
             }
 
-            if ( isset($_REQUEST['post_status']) && $status_name == $_REQUEST['post_status'] ) {
+            if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
                 $class = 'current';
             }
@@ -410 +410 @@
         <div class="alignleft actions">
 <?php
-        if ( 'top' == $which && !is_singular() ) {
+        if ( 'top' === $which && !is_singular() ) {
 
             $this->months_dropdown( $this->screen->post_type );
@@ -472 +472 @@
         parent::pagination( $which );
 
-        if ( 'top' == $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
+        if ( 'top' === $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
             $this->view_switcher( $mode );
     }
@@ -520 +520 @@
 
         foreach ( $taxonomies as $taxonomy ) {
-            if ( 'category' == $taxonomy )
+            if ( 'category' === $taxonomy )
                 $column_key = 'categories';
-            elseif ( 'post_tag' == $taxonomy )
+            elseif ( 'post_tag' === $taxonomy )
                 $column_key = 'tags';
             else
@@ -536 +536 @@
         $posts_columns['date'] = __( 'Date' );
 
-        if ( 'page' == $post_type ) {
+        if ( 'page' === $post_type ) {
 
             /**
@@ -901 +901 @@
         }
 
-        if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) ) {
+        if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
             the_excerpt();
         }
@@ -921 +921 @@
         global $mode;
 
-        if ( '0000-00-00 00:00:00' == $post->post_date ) {
+        if ( '0000-00-00 00:00:00' === $post->post_date ) {
             $t_time = $h_time = __( 'Unpublished' );
             $time_diff = 0;
@@ -938 +938 @@
         }
 
-        if ( 'publish' == $post->post_status ) {
+        if ( 'publish' === $post->post_status ) {
             _e( 'Published' );
-        } elseif ( 'future' == $post->post_status ) {
+        } elseif ( 'future' === $post->post_status ) {
             if ( $time_diff > 0 ) {
                 echo '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
@@ -950 +950 @@
         }
         echo '<br />';
-        if ( 'excerpt' == $mode ) {
+        if ( 'excerpt' === $mode ) {
             /**
              * Filter the published time of the post.
@@ -1019 +1019 @@
      */
     public function column_default( $post, $column_name ) {
-        if ( 'categories' == $column_name ) {
+        if ( 'categories' === $column_name ) {
             $taxonomy = 'category';
-        } elseif ( 'tags' == $column_name ) {
+        } elseif ( 'tags' === $column_name ) {
             $taxonomy = 'post_tag';
         } elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
@@ -1173 +1173 @@
 
         if ( current_user_can( 'delete_post', $post->ID ) ) {
-            if ( 'trash' == $post->post_status )
+            if ( 'trash' === $post->post_status )
                 $actions['untrash'] = "<a title='" . esc_attr__( 'Restore this item from the Trash' ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
             elseif ( EMPTY_TRASH_DAYS )
                 $actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash' ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
-            if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
+            if ( 'trash' === $post->post_status || !EMPTY_TRASH_DAYS )
                 $actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently' ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
         }
@@ -1272 +1272 @@
         }
 
-        $m = ( isset( $mode ) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
+        $m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
         $can_publish = current_user_can( $post_type_object->cap->publish_posts );
         $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
@@ -1380 +1380 @@
 
             <span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
-            <input type="hidden" name="<?php echo ( $taxonomy->name == 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
+            <input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
             <ul class="cat-checklist <?php echo esc_attr( $taxonomy->name )?>-checklist">
                 <?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ) ?>
@@ -1443 +1443 @@
     <?php   endif; // !$bulk
 
-            if ( 'page' == $screen->post_type ) :
+            if ( 'page' === $screen->post_type ) :
     ?>
 
@@ -1543 +1543 @@
                 </label>
 
-    <?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+    <?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
 
     <?php   if ( $bulk ) : ?>

trunk/src/wp-admin/includes/class-wp-terms-list-table.php

@@ -70 +70 @@
         $tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
 
-        if ( 'post_tag' == $this->screen->taxonomy ) {
+        if ( 'post_tag' === $this->screen->taxonomy ) {
             /**
              * Filter the number of terms displayed per page for the Tags list table.
@@ -89 +89 @@
              */
             $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page );
-        } elseif ( 'category' == $this->screen->taxonomy ) {
+        } elseif ( 'category' === $this->screen->taxonomy ) {
             /**
              * Filter the number of terms displayed per page for the Categories list table.
@@ -154 +154 @@
      */
     public function current_action() {
-        if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' == $_REQUEST['action'] || 'delete' == $_REQUEST['action2'] ) )
+        if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) )
             return 'bulk-delete';
 
@@ -172 +172 @@
         );
 
-        if ( 'link_category' == $this->screen->taxonomy ) {
+        if ( 'link_category' === $this->screen->taxonomy ) {
             $columns['links'] = __( 'Links' );
         } else {
@@ -497 +497 @@
             $args['post_type'] = $this->screen->post_type;
 
-        if ( 'attachment' == $this->screen->post_type )
+        if ( 'attachment' === $this->screen->post_type )
             return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
 

trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php

@@ -51 +51 @@
         $tabs = array();
         $tabs['dashboard'] = __( 'Search' );
-        if ( 'search' == $tab )
+        if ( 'search' === $tab )
             $tabs['search'] = __( 'Search Results' );
         $tabs['upload'] = __( 'Upload' );
@@ -164 +164 @@
         $display_tabs = array();
         foreach ( (array) $tabs as $action => $text ) {
-            $class = ( $action == $tab ) ? ' class="current"' : '';
+            $class = ( $action === $tab ) ? ' class="current"' : '';
             $href = self_admin_url('theme-install.php?tab=' . $action);
             $display_tabs['theme-install-'.$action] = "<a href='$href'$class>$text</a>";

trunk/src/wp-admin/includes/class-wp-users-list-table.php

@@ -46 +46 @@
         ) );
 
-        $this->is_site_users = 'site-users-network' == $this->screen->id;
+        $this->is_site_users = 'site-users-network' === $this->screen->id;
 
         if ( $this->is_site_users )
@@ -170 +170 @@
             $class = '';
 
-            if ( $this_role == $role ) {
+            if ( $this_role === $role ) {
                 $class = ' class="current"';
             }