Resolve conflicts
This commit is contained in:
parent
e5341719dc
commit
cc2c2b4333
|
@ -72,6 +72,7 @@ class TAINACAN_REST_Controller extends WP_REST_Controller {
|
|||
* @param $request
|
||||
*
|
||||
* @return array
|
||||
* @throws Exception
|
||||
*/
|
||||
protected function prepare_filters($request){
|
||||
$queries = [
|
||||
|
@ -97,12 +98,9 @@ class TAINACAN_REST_Controller extends WP_REST_Controller {
|
|||
'paged' => 'paged',
|
||||
'postin' => 'post__in',
|
||||
'relation' => 'relation',
|
||||
<<<<<<< HEAD
|
||||
'nopaging' => 'nopaging'
|
||||
=======
|
||||
'nopaging' => 'nopaging',
|
||||
'meta_key' => 'meta_key',
|
||||
'meta_type' => 'meta_type'
|
||||
>>>>>>> 081c9b2e44413a5eb9b01c5fb20b6cd94b0dc233
|
||||
];
|
||||
|
||||
$meta_query = [
|
||||
|
|
Loading…
Reference in New Issue