Consolidate ID tie-breaker logic and ensure consistent SQL output in unit tests for orderby scenarios.

Author: ramonjd

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

@@ -2558,14 +2558,6 @@ public function get_posts() {
 						$has_id_orderby = true;
 					}
 				}
-
-				// Add ID as tie-breaker if needed and not already present
-				if ( $needs_deterministic_orderby && ! $has_id_orderby ) {
-					$orderby_array[] = "{$wpdb->posts}.ID " . $query_vars['order'];
-				}
-
-				$orderby = implode( ', ', $orderby_array );
-
 			} else {
 				$query_vars['orderby'] = urldecode( $query_vars['orderby'] );
 				$query_vars['orderby'] = addslashes_gpc( $query_vars['orderby'] );
@@ -2586,16 +2578,18 @@ public function get_posts() {
 						$has_id_orderby = true;
 					}
 				}
-				$orderby = implode( ', ', $orderby_array );
+			}
 
-				if ( empty( $orderby ) ) {
-					$orderby = "{$wpdb->posts}.post_date " . $query_vars['order'] . ', ' . "{$wpdb->posts}.ID " . $query_vars['order'];
-				} elseif ( $needs_deterministic_orderby && ! $has_id_orderby ) {
-					// Add ID as tie-breaker for deterministic ordering
-					$orderby .= ", {$wpdb->posts}.ID " . $query_vars['order'];
-				} elseif ( ! empty( $query_vars['order'] ) ) {
-					$orderby .= " {$query_vars['order']}";
-				}
+			// Add ID as tie-breaker if needed and not already present
+			if ( $needs_deterministic_orderby && ! $has_id_orderby ) {
+				$orderby_array[] = "{$wpdb->posts}.ID " . $query_vars['order'];
+			}
+
+			// Build the final orderby string
+			if ( empty( $orderby_array ) ) {
+				$orderby = "{$wpdb->posts}.post_date " . $query_vars['order'] . ', ' . "{$wpdb->posts}.ID " . $query_vars['order'];
+			} else {
+				$orderby = implode( ', ', $orderby_array );
 			}
 		}
 

tests/phpunit/tests/admin/wpPrivacyRequestsTable.php

@@ -100,12 +100,14 @@ public function test_columns_should_be_sortable( $order, $orderby, $search, $exp
 		unset( $_REQUEST['s'] );
 
 		$expected_query = explode( ', ', $expected );
-		$expected_query = array_map( function( $item ) use ( $wpdb ) {
-			return "{$wpdb->posts}.{$item}";
-		}, $expected_query );
-		$expected_query = implode( ', ', $expected_query );
+		$expected_query = array_map(
+			function( $item ) use ( $wpdb ) {
+				return "{$wpdb->posts}.{$item}";
+			},
+			$expected_query
+		);
 
-		$this->assertStringContainsString( "ORDER BY {$expected_query}", $this->sql );
+		$this->assertStringContainsString( "ORDER BY " . implode( ', ', $expected_query ), $this->sql );
 	}
 
 	/**