WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Drew Jaynes 2017-07-13 15:42:44 +00:00
parent e42553dbea
commit e1a227cf11
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/class-wp-query.php
View File

@ -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 * @since 3.7.0
* @access protected
*
* @global wpdb $wpdb WordPress database abstraction object.
* *
* @param array $q Query variables. * @param array $q Query variables.
* @return string WHERE clause. * @return string WHERE clause.
@ -1509,6 +1512,8 @@ class WP_Query {
* @since 4.0.0 * @since 4.0.0
* @access protected * @access protected
* *
* @global wpdb $wpdb WordPress database abstraction object.
*
* @param string $orderby Alias for the field to order by. * @param string $orderby Alias for the field to order by.
* @return string|false Table-prefixed value to used in the ORDER clause. False otherwise. * @return string|false Table-prefixed value to used in the ORDER clause. False otherwise.
*/ */

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.