From 367c02c1c0c6a7d865fdfa81fcbf57149a4c15ba Mon Sep 17 00:00:00 2001
From: Herb Miller <herb@bobbingwide.com>
Date: Thu, 2 Jul 2020 15:24:34 +0100
Subject: [PATCH] Issue #12795 - prefix all orderby keys and use original order

---
 lib/compat.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/compat.php b/lib/compat.php
index 68dbf7715f5fa..22a282b1a2255 100644
--- a/lib/compat.php
+++ b/lib/compat.php
@@ -480,14 +480,14 @@ function gutenberg_render_block_with_assigned_block_context( $pre_render, $parse
  *
  * @see https://core.trac.wordpress.org/ticket/46294
  *
- * @param string $orderby Current orderby value.
+ * @param string   $orderby Current orderby value.
  * @param WP_Query $query Query object.
  */
 function gutenberg_posts_orderby( $orderby, $query ) {
 	global $wpdb;
-	if ( defined('REST_REQUEST') && REST_REQUEST ) {
-		if ( $query->query['orderby'] === 'menu_order' ) {
-			$orderby = "$wpdb->posts.menu_order,post_title,id asc";
+	if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+		if ( 'menu_order' === $query->query['orderby'] ) {
+			$orderby = "$wpdb->posts.menu_order,$wpdb->posts.post_title,$wpdb->posts.id " . $query->query['order'] ;
 		}
 	}
 	return $orderby;