From e1a227cf114439a0bdff278f3fbe5f0cbc03828a Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Thu, 13 Jul 2017 15:42:44 +0000
Subject: [PATCH] Docs: Document usage of the `$wpdb` global in
 `WP_Query::parse_search()` and `WP_Query::parse_orderby()`.

Props avinapatel.
Fixes #41313.

Built from https://develop.svn.wordpress.org/trunk@41041


git-svn-id: http://core.svn.wordpress.org/trunk@40891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-query.php | 7 ++++++-
 wp-includes/version.php        | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php
index 518e5638b6..cc415a44d6 100644
--- a/wp-includes/class-wp-query.php
+++ b/wp-includes/class-wp-query.php
@@ -1292,9 +1292,12 @@ class WP_Query {
 	}
 
 	/**
-	 * Generate SQL for the WHERE clause based on passed search terms.
+	 * Generates SQL for the WHERE clause based on passed search terms.
 	 *
 	 * @since 3.7.0
+	 * @access protected
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param array $q Query variables.
 	 * @return string WHERE clause.
@@ -1509,6 +1512,8 @@ class WP_Query {
 	 * @since 4.0.0
 	 * @access protected
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Table-prefixed value to used in the ORDER clause. False otherwise.
 	 */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 95665241c6..58defbc558 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41040';
+$wp_version = '4.9-alpha-41041';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.