Changeset 47785

Timestamp:

05/12/2020 06:30:03 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in some wp-admin files.

Props pikamander2, mukesh27, SergeyBiryukov.
Fixes #49239.

Location:

trunk/src/wp-admin

Files:

• admin-header.php (modified) (2 diffs)
• admin.php (modified) (1 diff)
• async-upload.php (modified) (1 diff)
• comment.php (modified) (7 diffs)
• edit-comments.php (modified) (2 diffs)
• edit-form-advanced.php (modified) (14 diffs)
• edit-form-comment.php (modified) (1 diff)
• edit-link-form.php (modified) (1 diff)
• edit-tag-form.php (modified) (6 diffs)
• edit.php (modified) (3 diffs)
• export.php (modified) (5 diffs)
• import.php (modified) (1 diff)
• includes/upgrade.php (modified) (6 diffs)
• install-helper.php (modified) (9 diffs)
• install.php (modified) (2 diffs)
• link-manager.php (modified) (1 diff)
• link-parse-opml.php (modified) (2 diffs)
• link.php (modified) (2 diffs)
• load-styles.php (modified) (1 diff)
• media-upload.php (modified) (2 diffs)
• media.php (modified) (2 diffs)
• menu-header.php (modified) (8 diffs)
• ms-delete-site.php (modified) (2 diffs)
• my-sites.php (modified) (3 diffs)

trunk/src/wp-admin/admin-header.php

@@ -45 +45 @@
 }
 
-if ( $admin_title == $title ) {
+if ( $admin_title === $title ) {
     /* translators: Admin screen title. %s: Admin screen name. */
     $admin_title = sprintf( __( '%s — WordPress' ), $title );
@@ -148 +148 @@
 do_action( 'admin_head' );
 
-if ( get_user_setting( 'mfold' ) == 'f' ) {
+if ( get_user_setting( 'mfold' ) === 'f' ) {
     $admin_body_class .= ' folded';
 }

trunk/src/wp-admin/admin.php

@@ -46 +46 @@
      */
     do_action( 'after_db_upgrade' );
-} elseif ( get_option( 'db_version' ) != $wp_db_version && empty( $_POST ) ) {
+} elseif ( get_option( 'db_version' ) !== $wp_db_version && empty( $_POST ) ) {
     if ( ! is_multisite() ) {
         wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );

trunk/src/wp-admin/async-upload.php

@@ -43 +43 @@
     $id   = intval( $_REQUEST['attachment_id'] );
     $post = get_post( $id );
-    if ( 'attachment' != $post->post_type ) {
+    if ( 'attachment' !== $post->post_type ) {
         wp_die( __( 'Invalid post type.' ) );
     }

trunk/src/wp-admin/comment.php

@@ -23 +23 @@
 }
 
-if ( 'cdc' == $action ) {
+if ( 'cdc' === $action ) {
     $action = 'delete';
-} elseif ( 'mac' == $action ) {
+} elseif ( 'mac' === $action ) {
     $action = 'approve';
 }
 
 if ( isset( $_GET['dt'] ) ) {
-    if ( 'spam' == $_GET['dt'] ) {
+    if ( 'spam' === $_GET['dt'] ) {
         $action = 'spam';
-    } elseif ( 'trash' == $_GET['dt'] ) {
+    } elseif ( 'trash' === $_GET['dt'] ) {
         $action = 'trash';
     }
@@ -72 +72 @@
         }
 
-        if ( 'trash' == $comment->comment_approved ) {
+        if ( 'trash' === $comment->comment_approved ) {
             comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
         }
@@ -102 +102 @@
 
         // No need to re-approve/re-trash/re-spam a comment.
-        if ( str_replace( '1', 'approve', $comment->comment_approved ) == $action ) {
+        if ( str_replace( '1', 'approve', $comment->comment_approved ) === $action ) {
             wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
             die();
@@ -110 +110 @@
 
         $formaction    = $action . 'comment';
-        $nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
+        $nonce_action  = ( 'approve' === $action ) ? 'approve-comment_' : 'delete-comment_';
         $nonce_action .= $comment_id;
 
@@ -138 +138 @@
         }
 
-        if ( '0' != $comment->comment_approved ) { // If not unapproved.
+        if ( '0' !== $comment->comment_approved ) { // If not unapproved.
             $message = '';
             switch ( $comment->comment_approved ) {
@@ -272 +272 @@
         }
 
-        if ( '' != wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
+        if ( wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
             $redir = wp_get_referer();
-        } elseif ( '' != wp_get_original_referer() && ! $noredir ) {
+        } elseif ( wp_get_original_referer() && ! $noredir ) {
             $redir = wp_get_original_referer();
         } elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ), true ) ) {
@@ -349 +349 @@
          */
         $location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+
         wp_redirect( $location );
-
-        exit();
+        exit;
 
     default:

trunk/src/wp-admin/edit-comments.php

@@ -25 +25 @@
     check_admin_referer( 'bulk-comments' );
 
-    if ( 'delete_all' == $doaction && ! empty( $_REQUEST['pagegen_timestamp'] ) ) {
+    if ( 'delete_all' === $doaction && ! empty( $_REQUEST['pagegen_timestamp'] ) ) {
         $comment_status = wp_unslash( $_REQUEST['comment_status'] );
         $delete_time    = wp_unslash( $_REQUEST['pagegen_timestamp'] );
@@ -32 +32 @@
     } elseif ( isset( $_REQUEST['delete_comments'] ) ) {
         $comment_ids = $_REQUEST['delete_comments'];
-        $doaction    = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
+        $doaction    = ( '-1' !== $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
     } elseif ( isset( $_REQUEST['ids'] ) ) {
         $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );

trunk/src/wp-admin/edit-form-advanced.php

@@ -77 +77 @@
 $action  = isset( $action ) ? $action : '';
 
-if ( get_option( 'page_for_posts' ) == $post_ID && empty( $post->post_content ) ) {
+if ( (int) get_option( 'page_for_posts' ) === $post_ID && empty( $post->post_content ) ) {
     add_action( 'edit_form_after_title', '_wp_posts_page_notice' );
     remove_post_type_support( $post_type, 'editor' );
@@ -229 +229 @@
 $notice     = false;
 $form_extra = '';
-if ( 'auto-draft' == $post->post_status ) {
-    if ( 'edit' == $action ) {
+if ( 'auto-draft' === $post->post_status ) {
+    if ( 'edit' === $action ) {
         $post->post_title = '';
     }
@@ -277 +277 @@
 );
 
-if ( 'post' == $post_type ) {
+if ( 'post' === $post_type ) {
     $customize_display = '<p>' . __( 'The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.' ) . '</p>';
 
@@ -314 +314 @@
             '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
     );
-} elseif ( 'page' == $post_type ) {
+} elseif ( 'page' === $post_type ) {
     $about_pages = '<p>' . __( 'Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.' ) . '</p>' .
         '<p>' . __( 'Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.' ) . '</p>';
@@ -332 +332 @@
             '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
     );
-} elseif ( 'attachment' == $post_type ) {
+} elseif ( 'attachment' === $post_type ) {
     get_current_screen()->add_help_tab(
         array(
@@ -352 +352 @@
 }
 
-if ( 'post' == $post_type || 'page' == $post_type ) {
+if ( 'post' === $post_type || 'page' === $post_type ) {
     $inserting_media  = '<p>' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the &#8220;Create a new gallery&#8221; button.' ) . '</p>';
     $inserting_media .= '<p>' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. <a href="https://wordpress.org/support/article/embeds/">Learn more about embeds</a>.' ) . '</p>';
@@ -365 +365 @@
 }
 
-if ( 'post' == $post_type ) {
+if ( 'post' === $post_type ) {
     $publish_box  = '<p>' . __( 'Several boxes on this screen contain settings for how your content will be published, including:' ) . '</p>';
     $publish_box .= '<ul><li>' .
@@ -403 +403 @@
         )
     );
-} elseif ( 'page' == $post_type ) {
+} elseif ( 'page' === $post_type ) {
     $page_attributes = '<p>' . __( '<strong>Parent</strong> &mdash; You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.' ) . '</p>' .
         '<p>' . __( '<strong>Template</strong> &mdash; Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.' ) . '</p>' .
@@ -472 +472 @@
     <?php
 }
-if ( 'draft' != get_post_status( $post ) ) {
+if ( 'draft' !== get_post_status( $post ) ) {
     wp_original_referer_field( true, 'previous' );
 }
@@ -496 +496 @@
 
 <div id="poststuff">
-<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
+<div id="post-body" class="metabox-holder columns-<?php echo ( 1 === get_current_screen()->get_columns() ) ? '1' : '2'; ?>">
 <div id="post-body-content">
 
@@ -536 +536 @@
 
             if ( ! empty( $shortlink ) && $shortlink !== $permalink && home_url( '?page_id=' . $post->ID ) !== $permalink ) {
-                $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" /><button type="button" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val());">' . __( 'Get Shortlink' ) . '</button>';
+                $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" />' .
+                    '<button type="button" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val());">' .
+                    __( 'Get Shortlink' ) .
+                    '</button>';
             }
         }
 
-        if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
-            $has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
+        if ( $post_type_object->public
+            && ! ( 'pending' === get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) )
+        ) {
+            $has_sample_permalink = $sample_permalink_html && 'auto-draft' !== $post->post_status;
             ?>
     <div id="edit-slug-box" class="hide-if-no-js">
@@ -609 +614 @@
     <span class="autosave-message">&nbsp;</span>
     <?php
-    if ( 'auto-draft' != $post->post_status ) {
+    if ( 'auto-draft' !== $post->post_status ) {
         echo '<span id="last-edit">';
         $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) );
@@ -643 +648 @@
 <?php
 
-if ( 'page' == $post_type ) {
+if ( 'page' === $post_type ) {
     /**
      * Fires before meta boxes with 'side' context are output for the 'page' post type.
@@ -677 +682 @@
 do_meta_boxes( null, 'normal', $post );
 
-if ( 'page' == $post_type ) {
+if ( 'page' === $post_type ) {
     /**
      * Fires after 'normal' context meta boxes have been output for the 'page' post type.

trunk/src/wp-admin/edit-form-comment.php

@@ -119 +119 @@
 </fieldset>
 </div><!-- .misc-pub-section -->
-    
+
 <div class="misc-pub-section curtime misc-pub-curtime">
 <?php

trunk/src/wp-admin/edit-link-form.php

@@ -109 +109 @@
 <div id="poststuff">
 
-<div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
+<div id="post-body" class="metabox-holder columns-<?php echo ( 1 === get_current_screen()->get_columns() ) ? '1' : '2'; ?>">
 <div id="post-body-content">
 <div id="namediv" class="stuffbox">

trunk/src/wp-admin/edit-tag-form.php

@@ -13 +13 @@
 
 // Back compat hooks.
-if ( 'category' == $taxonomy ) {
+if ( 'category' === $taxonomy ) {
     /**
      * Fires before the Edit Category form.
@@ -23 +23 @@
      */
     do_action_deprecated( 'edit_category_form_pre', array( $tag ), '3.0.0', '{$taxonomy}_pre_edit_form' );
-} elseif ( 'link_category' == $taxonomy ) {
+} elseif ( 'link_category' === $taxonomy ) {
     /**
      * Fires before the Edit Link Category form.
@@ -178 +178 @@
                 wp_dropdown_categories( $dropdown_args );
                 ?>
-                <?php if ( 'category' == $taxonomy ) : ?>
+                <?php if ( 'category' === $taxonomy ) : ?>
                     <p class="description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
                 <?php else : ?>
@@ -193 +193 @@
         <?php
         // Back compat hooks.
-        if ( 'category' == $taxonomy ) {
+        if ( 'category' === $taxonomy ) {
             /**
              * Fires after the Edit Category form fields are displayed.
@@ -203 +203 @@
              */
             do_action_deprecated( 'edit_category_form_fields', array( $tag ), '3.0.0', '{$taxonomy}_edit_form_fields' );
-        } elseif ( 'link_category' == $taxonomy ) {
+        } elseif ( 'link_category' === $taxonomy ) {
             /**
              * Fires after the Edit Link Category form fields are displayed.
@@ -240 +240 @@
 <?php
 // Back compat hooks.
-if ( 'category' == $taxonomy ) {
+if ( 'category' === $taxonomy ) {
     /** This action is documented in wp-admin/edit-tags.php */
     do_action_deprecated( 'edit_category_form', array( $tag ), '3.0.0', '{$taxonomy}_add_form' );
-} elseif ( 'link_category' == $taxonomy ) {
+} elseif ( 'link_category' === $taxonomy ) {
     /** This action is documented in wp-admin/edit-tags.php */
     do_action_deprecated( 'edit_link_category_form', array( $tag ), '3.0.0', '{$taxonomy}_add_form' );

trunk/src/wp-admin/edit.php

@@ -333 +333 @@
     /* translators: %s: Number of posts. */
     'updated'   => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
-    'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
+    'locked'    => ( 1 === $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
                     /* translators: %s: Number of posts. */
                     _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
@@ -346 +346 @@
     /* translators: %s: Number of pages. */
     'updated'   => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
-    'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
+    'locked'    => ( 1 === $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
                     /* translators: %s: Number of pages. */
                     _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
@@ -359 +359 @@
     /* translators: %s: Number of blocks. */
     'updated'   => _n( '%s block updated.', '%s blocks updated.', $bulk_counts['updated'] ),
-    'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 block not updated, somebody is editing it.' ) :
+    'locked'    => ( 1 === $bulk_counts['locked'] ) ? __( '1 block not updated, somebody is editing it.' ) :
                     /* translators: %s: Number of blocks. */
                     _n( '%s block not updated, somebody is editing it.', '%s blocks not updated, somebody is editing them.', $bulk_counts['locked'] ),

trunk/src/wp-admin/export.php

@@ -63 +63 @@
     $args = array();
 
-    if ( ! isset( $_GET['content'] ) || 'all' == $_GET['content'] ) {
+    if ( ! isset( $_GET['content'] ) || 'all' === $_GET['content'] ) {
         $args['content'] = 'all';
-    } elseif ( 'posts' == $_GET['content'] ) {
+    } elseif ( 'posts' === $_GET['content'] ) {
         $args['content'] = 'post';
 
@@ -84 +84 @@
             $args['status'] = $_GET['post_status'];
         }
-    } elseif ( 'pages' == $_GET['content'] ) {
+    } elseif ( 'pages' === $_GET['content'] ) {
         $args['content'] = 'page';
 
@@ -99 +99 @@
             $args['status'] = $_GET['page_status'];
         }
-    } elseif ( 'attachment' == $_GET['content'] ) {
+    } elseif ( 'attachment' === $_GET['content'] ) {
         $args['content'] = 'attachment';
 
@@ -145 +145 @@
         WHERE post_type = %s AND post_status != 'auto-draft'
         ORDER BY post_date DESC
-    ",
+            ",
             $post_type
         )
@@ -151 +151 @@
 
     $month_count = count( $months );
-    if ( ! $month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
+    if ( ! $month_count || ( 1 === $month_count && 0 === (int) $months[0]->month ) ) {
         return;
     }
 
     foreach ( $months as $date ) {
-        if ( 0 == $date->year ) {
+        if ( 0 === (int) $date->year ) {
             continue;
         }

trunk/src/wp-admin/import.php

@@ -43 +43 @@
 if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
     $importer_id = $popular_importers[ $_GET['invalid'] ]['importer-id'];
-    if ( $importer_id != $_GET['invalid'] ) { // Prevent redirect loops.
+    if ( $importer_id !== $_GET['invalid'] ) { // Prevent redirect loops.
         wp_redirect( admin_url( 'admin.php?import=' . $importer_id ) );
         exit;

trunk/src/wp-admin/includes/upgrade.php

@@ -2347 +2347 @@
     $query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $table_name ) );
 
-    if ( $wpdb->get_var( $query ) == $table_name ) {
+    if ( $wpdb->get_var( $query ) === $table_name ) {
         return true;
     }
@@ -2355 +2355 @@
 
     // We cannot directly tell that whether this succeeded!
-    if ( $wpdb->get_var( $query ) == $table_name ) {
+    if ( $wpdb->get_var( $query ) === $table_name ) {
         return true;
     }
+
     return false;
 }
@@ -2374 +2375 @@
 function drop_index( $table, $index ) {
     global $wpdb;
+
     $wpdb->hide_errors();
+
     $wpdb->query( "ALTER TABLE `$table` DROP INDEX `$index`" );
+
     // Now we need to take out all the extra ones we may have created.
     for ( $i = 0; $i < 25; $i++ ) {
         $wpdb->query( "ALTER TABLE `$table` DROP INDEX `{$index}_$i`" );
     }
+
     $wpdb->show_errors();
+
     return true;
 }
@@ -2397 +2403 @@
 function add_clean_index( $table, $index ) {
     global $wpdb;
+
     drop_index( $table, $index );
     $wpdb->query( "ALTER TABLE `$table` ADD INDEX ( `$index` )" );
+
     return true;
 }
@@ -2416 +2424 @@
 function maybe_add_column( $table_name, $column_name, $create_ddl ) {
     global $wpdb;
+
     foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
-        if ( $column == $column_name ) {
+        if ( $column === $column_name ) {
             return true;
         }
@@ -2427 +2436 @@
     // We cannot directly tell that whether this succeeded!
     foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
-        if ( $column == $column_name ) {
+        if ( $column === $column_name ) {
             return true;
         }
     }
+
     return false;
 }

trunk/src/wp-admin/install-helper.php

@@ -52 +52 @@
     function maybe_create_table( $table_name, $create_ddl ) {
         global $wpdb;
+
         foreach ( $wpdb->get_col( 'SHOW TABLES', 0 ) as $table ) {
-            if ( $table == $table_name ) {
-                return true;
-            }
-        }
+            if ( $table === $table_name ) {
+                return true;
+            }
+        }
+
         // Didn't find it, so try to create it.
         $wpdb->query( $create_ddl );
@@ -62 +64 @@
         // We cannot directly tell that whether this succeeded!
         foreach ( $wpdb->get_col( 'SHOW TABLES', 0 ) as $table ) {
-            if ( $table == $table_name ) {
-                return true;
-            }
-        }
+            if ( $table === $table_name ) {
+                return true;
+            }
+        }
+
         return false;
     }
@@ -85 +88 @@
     function maybe_add_column( $table_name, $column_name, $create_ddl ) {
         global $wpdb;
+
         foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
-
-            if ( $column == $column_name ) {
+            if ( $column === $column_name ) {
                 return true;
             }
@@ -97 +100 @@
         // We cannot directly tell that whether this succeeded!
         foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
-            if ( $column == $column_name ) {
-                return true;
-            }
-        }
+            if ( $column === $column_name ) {
+                return true;
+            }
+        }
+
         return false;
     }
@@ -119 +123 @@
 function maybe_drop_column( $table_name, $column_name, $drop_ddl ) {
     global $wpdb;
+
     foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
-        if ( $column == $column_name ) {
+        if ( $column === $column_name ) {
 
             // Found it, so try to drop it.
@@ -127 +132 @@
             // We cannot directly tell that whether this succeeded!
             foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
-                if ( $column == $column_name ) {
+                if ( $column === $column_name ) {
                     return false;
                 }
@@ -133 +138 @@
         }
     }
+
     // Else didn't find it.
     return true;
@@ -168 +174 @@
 function check_column( $table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null ) {
     global $wpdb;
+
     $diffs   = 0;
     $results = $wpdb->get_results( "DESC $table_name" );
@@ -173 +180 @@
     foreach ( $results as $row ) {
 
-        if ( $row->Field == $col_name ) {
+        if ( $row->Field === $col_name ) {
 
             // Got our column, check the params.
-            if ( ( null != $col_type ) && ( $row->Type != $col_type ) ) {
-                ++$diffs;
-            }
-            if ( ( null != $is_null ) && ( $row->Null != $is_null ) ) {
-                ++$diffs;
-            }
-            if ( ( null != $key ) && ( $row->Key != $key ) ) {
-                ++$diffs;
-            }
-            if ( ( null != $default ) && ( $row->Default != $default ) ) {
-                ++$diffs;
-            }
-            if ( ( null != $extra ) && ( $row->Extra != $extra ) ) {
-                ++$diffs;
-            }
+            if ( ( null !== $col_type ) && ( $row->Type !== $col_type ) ) {
+                ++$diffs;
+            }
+            if ( ( null !== $is_null ) && ( $row->Null !== $is_null ) ) {
+                ++$diffs;
+            }
+            if ( ( null !== $key ) && ( $row->Key !== $key ) ) {
+                ++$diffs;
+            }
+            if ( ( null !== $default ) && ( $row->Default !== $default ) ) {
+                ++$diffs;
+            }
+            if ( ( null !== $extra ) && ( $row->Extra !== $extra ) ) {
+                ++$diffs;
+            }
+
             if ( $diffs > 0 ) {
                 return false;
             }
+
             return true;
         } // End if found our column.
     }
+
     return false;
 }

trunk/src/wp-admin/install.php

@@ -92 +92 @@
     global $wpdb;
 
-    $sql        = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->users ) );
-    $user_table = ( $wpdb->get_var( $sql ) != null );
+    $user_table = ( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->users ) ) ) !== null );
 
     // Ensure that sites appear in search engines by default.
@@ -370 +369 @@
             display_setup_form( __( 'Please provide a valid username.' ) );
             $error = true;
-        } elseif ( sanitize_user( $user_name, true ) != $user_name ) {
+        } elseif ( sanitize_user( $user_name, true ) !== $user_name ) {
             display_setup_form( __( 'The username you provided has invalid characters.' ) );
             $error = true;
-        } elseif ( $admin_password != $admin_password_check ) {
+        } elseif ( $admin_password !== $admin_password_check ) {
             // TODO: Poka-yoke.
             display_setup_form( __( 'Your passwords do not match. Please try again.' ) );

trunk/src/wp-admin/link-manager.php

@@ -24 +24 @@
     $bulklinks   = (array) $_REQUEST['linkcheck'];
 
-    if ( 'delete' == $doaction ) {
+    if ( 'delete' === $doaction ) {
         foreach ( $bulklinks as $link_id ) {
             $link_id = (int) $link_id;

trunk/src/wp-admin/link-parse-opml.php

@@ -28 +28 @@
  * @global array $feeds
  *
- * @param resource $parser XML Parser resource.
- * @param string $tagName XML element name.
- * @param array $attrs XML element attributes.
+ * @param resource $parser   XML Parser resource.
+ * @param string   $tag_name XML element name.
+ * @param array    $attrs    XML element attributes.
  */
-function startElement( $parser, $tagName, $attrs ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+function startElement( $parser, $tag_name, $attrs ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
     global $names, $urls, $targets, $descriptions, $feeds;
 
-    if ( 'OUTLINE' === $tagName ) {
+    if ( 'OUTLINE' === $tag_name ) {
         $name = '';
         if ( isset( $attrs['TEXT'] ) ) {
@@ -66 +66 @@
  * @access private
  *
- * @param resource $parser XML Parser resource.
- * @param string $tagName XML tag name.
+ * @param resource $parser   XML Parser resource.
+ * @param string   $tag_name XML tag name.
  */
-function endElement( $parser, $tagName ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+function endElement( $parser, $tag_name ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
     // Nothing to do.
 }

trunk/src/wp-admin/link.php

@@ -36 +36 @@
 
         // For each link id (in $linkcheck[]) change category to selected value.
-        if ( count( $linkcheck ) == 0 ) {
+        if ( count( $linkcheck ) === 0 ) {
             wp_redirect( $this_file );
             exit;
@@ -57 +57 @@
 
         // For each link id (in $linkcheck[]) change category to selected value.
-        if ( count( $linkcheck ) == 0 ) {
+        if ( count( $linkcheck ) === 0 ) {
             wp_redirect( $this_file );
             exit;

trunk/src/wp-admin/load-styles.php

@@ -38 +38 @@
 }
 
-$rtl            = ( isset( $_GET['dir'] ) && 'rtl' == $_GET['dir'] );
+$rtl            = ( isset( $_GET['dir'] ) && 'rtl' === $_GET['dir'] );
 $expires_offset = 31536000; // 1 year.
 $out            = '';

trunk/src/wp-admin/media-upload.php

@@ -30 +30 @@
 
 // IDs should be integers.
-$ID      = isset( $ID ) ? (int) $ID : 0;
+$ID      = isset( $ID ) ? (int) $ID : 0; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
 $post_id = isset( $post_id ) ? (int) $post_id : 0;
 
 // Require an ID for the edit screen.
-if ( isset( $action ) && 'edit' == $action && ! $ID ) {
+if ( isset( $action ) && 'edit' === $action && ! $ID ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName
     wp_die(
         '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
@@ -82 +82 @@
 
 // Let the action code decide how to handle the request.
-if ( 'type' == $tab || 'type_url' == $tab || ! array_key_exists( $tab, media_upload_tabs() ) ) {
+if ( 'type' === $tab || 'type_url' === $tab || ! array_key_exists( $tab, media_upload_tabs() ) ) {
     /**
      * Fires inside specific upload-type views in the legacy (pre-3.5.0)

trunk/src/wp-admin/media.php

@@ -30 +30 @@
             $referer  = wp_get_original_referer();
             if ( $referer ) {
-                if ( false !== strpos( $referer, 'upload.php' ) || ( url_to_postid( $referer ) == $attachment_id ) ) {
+                if ( false !== strpos( $referer, 'upload.php' ) || ( url_to_postid( $referer ) === $attachment_id ) ) {
                     $location = $referer;
                 }
@@ -70 +70 @@
             wp_die( __( 'You attempted to edit an item that isn’t an attachment. Please go back and try again.' ) );
         }
-        if ( 'trash' == $att->post_status ) {
+        if ( 'trash' === $att->post_status ) {
             wp_die( __( 'You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) );
         }

trunk/src/wp-admin/menu-header.php

@@ -89 +89 @@
         }
 
-        if ( ( $parent_file && $item[2] == $parent_file ) || ( empty( $typenow ) && $self == $item[2] ) ) {
+        if ( ( $parent_file && $item[2] === $parent_file ) || ( empty( $typenow ) && $self === $item[2] ) ) {
             if ( ! empty( $submenu_items ) ) {
                 $class[] = 'wp-has-current-submenu wp-menu-open';
@@ -155 +155 @@
             $menu_file     = $submenu_items[0][2];
             $pos           = strpos( $menu_file, '?' );
+
             if ( false !== $pos ) {
                 $menu_file = substr( $menu_file, 0, $pos );
             }
-            if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+
+            if ( ! empty( $menu_hook )
+                || ( ( 'index.php' !== $submenu_items[0][2] )
+                    && file_exists( WP_PLUGIN_DIR . "/$menu_file" )
+                    && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) )
+            ) {
                 $admin_is_parent = true;
                 echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
@@ -168 +174 @@
             $menu_file = $item[2];
             $pos       = strpos( $menu_file, '?' );
+
             if ( false !== $pos ) {
                 $menu_file = substr( $menu_file, 0, $pos );
             }
-            if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+
+            if ( ! empty( $menu_hook )
+                || ( ( 'index.php' !== $item[2] )
+                    && file_exists( WP_PLUGIN_DIR . "/$menu_file" )
+                    && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) )
+            ) {
                 $admin_is_parent = true;
                 echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
@@ -193 +205 @@
                 $class           = array();
                 $aria_attributes = '';
+
                 if ( $first ) {
                     $class[] = 'wp-first-item';
@@ -199 +212 @@
 
                 $menu_file = $item[2];
-
-                $pos = strpos( $menu_file, '?' );
+                $pos       = strpos( $menu_file, '?' );
+
                 if ( false !== $pos ) {
                     $menu_file = substr( $menu_file, 0, $pos );
@@ -209 +222 @@
 
                 if ( isset( $submenu_file ) ) {
-                    if ( $submenu_file == $sub_item[2] ) {
+                    if ( $submenu_file === $sub_item[2] ) {
                         $class[]          = 'current';
                         $aria_attributes .= ' aria-current="page"';
@@ -216 +229 @@
                     // This allows plugin pages with the same hook to exist under different parents.
                 } elseif (
-                    ( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
-                    ( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists( $menu_file ) === false ) )
+                    ( ! isset( $plugin_page ) && $self === $sub_item[2] )
+                    || ( isset( $plugin_page ) && $plugin_page === $sub_item[2]
+                        && ( $item[2] === $self_type || $item[2] === $self || file_exists( $menu_file ) === false ) )
                 ) {
                     $class[]          = 'current';
@@ -238 +252 @@
                 $title = wptexturize( $sub_item[0] );
 
-                if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
+                if ( ! empty( $menu_hook )
+                    || ( ( 'index.php' !== $sub_item[2] )
+                        && file_exists( WP_PLUGIN_DIR . "/$sub_file" )
+                        && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) )
+                ) {
                     // If admin.php is the current page or if the parent exists as a file in the plugins or admin directory.
                     if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) ) {

trunk/src/wp-admin/ms-delete-site.php

@@ -18 +18 @@
 }
 
-if ( isset( $_GET['h'] ) && '' != $_GET['h'] && false != get_option( 'delete_blog_hash' ) ) {
+if ( isset( $_GET['h'] ) && '' !== $_GET['h'] && false !== get_option( 'delete_blog_hash' ) ) {
     if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
         wpmu_delete_blog( get_current_blog_id() );
@@ -43 +43 @@
 echo '<h1>' . esc_html( $title ) . '</h1>';
 
-if ( isset( $_POST['action'] ) && 'deleteblog' == $_POST['action'] && isset( $_POST['confirmdelete'] ) && '1' == $_POST['confirmdelete'] ) {
+if ( isset( $_POST['action'] ) && 'deleteblog' === $_POST['action'] && isset( $_POST['confirmdelete'] ) && '1' === $_POST['confirmdelete'] ) {
     check_admin_referer( 'delete-blog' );
 

trunk/src/wp-admin/my-sites.php

@@ -23 +23 @@
 
 $updated = false;
-if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
+if ( 'updateblogsettings' === $action && isset( $_POST['primary_blog'] ) ) {
     check_admin_referer( 'update-my-sites' );
 
@@ -108 +108 @@
      */
     $settings_html = apply_filters( 'myblogs_options', '', 'global' );
-    if ( '' != $settings_html ) {
+
+    if ( $settings_html ) {
         echo '<h3>' . __( 'Global Settings' ) . '</h3>';
         echo $settings_html;
     }
+
     reset( $blogs );
 
@@ -135 +137 @@
          */
         $actions = apply_filters( 'myblogs_blog_actions', $actions, $user_blog );
+
         echo "<p class='my-sites-actions'>" . $actions . '</p>';
 
         /** This filter is documented in wp-admin/my-sites.php */
         echo apply_filters( 'myblogs_options', '', $user_blog );
+
         echo '</li>';