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

Add unit tests for WP_Comment_Query 'orderby' param. 

For better testability, the SQL string generated in `WP_Comment_Query::get_posts()`
is now stored as a 'request' property on the object.

See #29902.
Built from https://develop.svn.wordpress.org/trunk@30003


git-svn-id: http://core.svn.wordpress.org/trunk@30003 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2014-10-24 02:34:18 +00:00
parent 8681dc786c
commit f780d0d09b
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/comment.php
View File

@ -221,6 +221,15 @@ function get_comments( $args = '' ) {
* @since 3.1.0 * @since 3.1.0
*/ */
class WP_Comment_Query { class WP_Comment_Query {
/**
* SQL for database query.
*
* @since 4.0.1
* @access public
* @var string
*/
public $request;
/** /**
* Metadata query container * Metadata query container
* *
@ -578,18 +587,19 @@ class WP_Comment_Query {
if ( $groupby ) { if ( $groupby ) {
$groupby = 'GROUP BY ' . $groupby; $groupby = 'GROUP BY ' . $groupby;
} }
$query = "SELECT $fields FROM $wpdb->comments $join WHERE $where $groupby ORDER BY $orderby $order $limits";
$this->request = "SELECT $fields FROM $wpdb->comments $join WHERE $where $groupby $orderby $order $limits";
if ( $this->query_vars['count'] ) { if ( $this->query_vars['count'] ) {
return $wpdb->get_var( $query ); return $wpdb->get_var( $this->request );
} }
if ( 'ids' == $this->query_vars['fields'] ) { if ( 'ids' == $this->query_vars['fields'] ) {
$this->comments = $wpdb->get_col( $query ); $this->comments = $wpdb->get_col( $this->request );
return array_map( 'intval', $this->comments ); return array_map( 'intval', $this->comments );
} }
$results = $wpdb->get_results( $query ); $results = $wpdb->get_results( $this->request );
/** /**
* Filter the comment query results. * Filter the comment query results.
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30002'; $wp_version = '4.1-alpha-30003';
/** /**
* 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.