Changeset 44573 for trunk/src/wp-includes/class-wp-comment-query.php

Timestamp:

01/12/2019 06:05:55 AM (5 years ago)

Author:

pento

Message:

Coding Standards: Fix and whitelist variable names.

From the WordPress.NamingConventions.ValidVariableName sniff, this commit fixes/whitelists all NotSnakeCaseMemberVar, MemberNotSnakeCase, and StringNotSnakeCase violations. It also fixes a handful of the NotSnakeCase violations.

See #45934.

File:

• trunk/src/wp-includes/class-wp-comment-query.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-comment-query.php

@@ -556 +556 @@
 
             $orderby_array            = array();
-            $found_orderby_comment_ID = false;
+            $found_orderby_comment_id = false;
             foreach ( $ordersby as $_key => $_value ) {
                 if ( ! $_value ) {
@@ -570 +570 @@
                 }
 
-                if ( ! $found_orderby_comment_ID && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
-                    $found_orderby_comment_ID = true;
+                if ( ! $found_orderby_comment_id && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
+                    $found_orderby_comment_id = true;
                 }
 
@@ -594 +594 @@
 
             // To ensure determinate sorting, always include a comment_ID clause.
-            if ( ! $found_orderby_comment_ID ) {
-                $comment_ID_order = '';
+            if ( ! $found_orderby_comment_id ) {
+                $comment_id_order = '';
 
                 // Inherit order from comment_date or comment_date_gmt, if available.
                 foreach ( $orderby_array as $orderby_clause ) {
                     if ( preg_match( '/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match ) ) {
-                        $comment_ID_order = $match[1];
+                        $comment_id_order = $match[1];
                         break;
                     }
@@ -606 +606 @@
 
                 // If no date-related order is available, use the date from the first available clause.
-                if ( ! $comment_ID_order ) {
+                if ( ! $comment_id_order ) {
                     foreach ( $orderby_array as $orderby_clause ) {
                         if ( false !== strpos( 'ASC', $orderby_clause ) ) {
-                            $comment_ID_order = 'ASC';
+                            $comment_id_order = 'ASC';
                         } else {
-                            $comment_ID_order = 'DESC';
+                            $comment_id_order = 'DESC';
                         }
 
@@ -619 +619 @@
 
                 // Default to DESC.
-                if ( ! $comment_ID_order ) {
-                    $comment_ID_order = 'DESC';
-                }
-
-                $orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
+                if ( ! $comment_id_order ) {
+                    $comment_id_order = 'DESC';
+                }
+
+                $orderby_array[] = "$wpdb->comments.comment_ID $comment_id_order";
             }