tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts

This commit is contained in:
weryques 2018-04-11 08:46:47 -03:00
parent e5341719dc
commit cc2c2b4333
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/class-tainacan-rest-controller.php
View File

@ -72,6 +72,7 @@ class TAINACAN_REST_Controller extends WP_REST_Controller {
* @param $request * @param $request
* *
* @return array * @return array
* @throws Exception
*/ */
protected function prepare_filters($request){ protected function prepare_filters($request){
$queries = [ $queries = [
@ -97,12 +98,9 @@ class TAINACAN_REST_Controller extends WP_REST_Controller {
'paged' => 'paged', 'paged' => 'paged',
'postin' => 'post__in', 'postin' => 'post__in',
'relation' => 'relation', 'relation' => 'relation',
<<<<<<< HEAD 'nopaging' => 'nopaging',
'nopaging' => 'nopaging'
=======
'meta_key' => 'meta_key', 'meta_key' => 'meta_key',
'meta_type' => 'meta_type' 'meta_type' => 'meta_type'
>>>>>>> 081c9b2e44413a5eb9b01c5fb20b6cd94b0dc233
]; ];
$meta_query = [ $meta_query = [