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

Fix inline documentation syntax in the DocBlock for `WP_Meta_Query->has_or_relation()`, added in 4.3. 

See [32713]. See #32891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-07-13 21:44:24 +00:00
parent 71a7b8c5a4
commit 6639c342a5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/meta.php
View File

@ -1590,15 +1590,15 @@ class WP_Meta_Query {
} }
/** /**
* Check whether the current query has any OR relations. * Checks whether the current query has any OR relations.
* *
* In some cases, the presence of an OR relation somewhere in the query will require the use of a DISTINCT or * In some cases, the presence of an OR relation somewhere in the query will require
* GROUP BY keyword in the SELECT clause. The current method can be used in these cases to determine whether * the use of a `DISTINCT` or `GROUP BY` keyword in the `SELECT` clause. The current
* such a clause is necessary. * method can be used in these cases to determine whether such a clause is necessary.
* *
* @since 4.3.0 * @since 4.3.0
* *
* @return bool True if the query contains any OR relations, otherwise false. * @return bool True if the query contains any `OR` relations, otherwise false.
*/ */
public function has_or_relation() { public function has_or_relation() {
return $this->has_or_relation; return $this->has_or_relation;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta2-33230'; $wp_version = '4.3-beta2-33231';
/** /**
* 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.