add orderby param in php

WordPress · Sep 1, 2020 · 5ebbd9e · 5ebbd9e
1 parent 10644f2
commit 5ebbd9e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/packages/block-library/src/query-loop/index.php b/packages/block-library/src/query-loop/index.php
@@ -22,6 +22,7 @@ function render_block_core_query_loop( $attributes, $content, $block ) {
 		'post_type' => 'post',
 		'offset' => isset( $block->context['query']['perPage'] ) ? ( $block->context['query']['perPage'] * ( $page - 1 ) + $block->context['query']['offset'] ) : 0,
 		'order' => isset( $block->context['query']['order'] ) ? strtoupper( $block->context['query']['order'] ) : 'DESC',
+		'orderby' => isset( $block->context['query']['orderBy'] ) ? $block->context['query']['orderBy'] : 'date',
 	);
 	if ( isset( $block->context['query']['categoryIds'] ) ) {
 		$query['category__in'] = $block->context['query']['categoryIds'];

diff --git a/packages/block-library/src/query/block.json b/packages/block-library/src/query/block.json
@@ -12,7 +12,8 @@
 				"pages": 1,
 				"offset": 0,
 				"categoryIds": [],
-				"order": "desc"
+				"order": "desc",
+				"orderBy": "date"
 			}
 		}
 	},

diff --git a/packages/e2e-tests/fixtures/blocks/core__query.json b/packages/e2e-tests/fixtures/blocks/core__query.json
@@ -1,18 +1,19 @@
 [
-    {
-        "clientId": "_clientId_0",
-        "name": "core/query",
-        "isValid": true,
-        "attributes": {
-            "query": {
-                "perPage": 3,
-                "pages": 1,
-                "offset": 0,
+	{
+		"clientId": "_clientId_0",
+		"name": "core/query",
+		"isValid": true,
+		"attributes": {
+			"query": {
+				"perPage": 3,
+				"pages": 1,
+				"offset": 0,
 				"categoryIds": [],
-				"order": "desc"
-            }
-        },
-        "innerBlocks": [],
-        "originalContent": ""
-    }
+				"order": "desc",
+				"orderBy": "date"
+			}
+		},
+		"innerBlocks": [],
+		"originalContent": ""
+	}
 ]