Merge pull request #374 from loganstellway/issues/262-multiple-orderby-fields

kidunot89 · web-flow · commit 2cd50a1e5c07 · 2020-11-24T12:18:41.000-05:00
Allow multiple "orderby" fields
diff --git a/includes/data/connection/trait-wc-cpt-loader-common.php b/includes/data/connection/trait-wc-cpt-loader-common.php
@@ -87,14 +87,12 @@ public function sanitize_common_inputs( array $input ) {
 
 					// Handle meta fields.
 				} elseif ( in_array( $orderby_input['field'], $this->ordering_meta(), true ) ) {
-					$args['orderby']  = array( 'meta_value_num' => $orderby_input['order'] );
+					$args['orderby']['meta_value_num'] = $orderby_input['order'];
 					$args['meta_key'] = esc_sql( $orderby_input['field'] ); // WPCS: slow query ok.
 
 					// Handle post object fields.
 				} elseif ( ! empty( $orderby_input['field'] ) ) {
-					$args['orderby'] = array(
-						esc_sql( $orderby_input['field'] ) => esc_sql( $orderby_input['order'] ),
-					);
+					$args['orderby'][esc_sql( $orderby_input['field'] )] = esc_sql( $orderby_input['order'] );
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -87,14 +87,12 @@ public function sanitize_common_inputs( array $input ) {`
`87`	`87`
`88`	`88`	`// Handle meta fields.`
`89`	`89`	`} elseif ( in_array( $orderby_input['field'], $this->ordering_meta(), true ) ) {`
`90`		`- $args['orderby'] = array( 'meta_value_num' => $orderby_input['order'] );`
	`90`	`+ $args['orderby']['meta_value_num'] = $orderby_input['order'];`
`91`	`91`	`$args['meta_key'] = esc_sql( $orderby_input['field'] ); // WPCS: slow query ok.`
`92`	`92`
`93`	`93`	`// Handle post object fields.`
`94`	`94`	`} elseif ( ! empty( $orderby_input['field'] ) ) {`
`95`		`- $args['orderby'] = array(`
`96`		`- esc_sql( $orderby_input['field'] ) => esc_sql( $orderby_input['order'] ),`
`97`		`- );`
	`95`	`+ $args['orderby'][esc_sql( $orderby_input['field'] )] = esc_sql( $orderby_input['order'] );`
`98`	`96`	`}`
`99`	`97`	`}`
`100`	`98`	`}`