Incorrect variable name for comment meta queries

[danielbachhuber]

An error notice I saw using the Liveblog plugin:

Undefined variable: q in /Users/danielbachhuber/wp/wp-includes/comment.php on line 299

traces back to r22074 where the following is added:

// Parse meta query
$this->meta_query = new WP_Meta_Query();
$this->meta_query->parse_query_vars( $this->query_vars );

but then is used later as:

if ( ! empty( $this->query_vars['meta_key'] ) ) {
	$allowed_keys[] = $q['meta_key'];
		$allowed_keys[] = 'meta_value';
		$allowed_keys[] = 'meta_value_num';
	}
	$ordersby = array_intersect( $ordersby, $allowed_keys );
	foreach ( $ordersby as $key => $value ) {
		if ( $value == $q['meta_key'] || $value == 'meta_value' ) {
			$ordersby[ $key ] = "$wpdb->commentmeta.meta_value";
		} elseif ( $value == 'meta_value_num' ) {
			$ordersby[ $key ] = "$wpdb->commentmeta.meta_value+0";
		}
	}
}

Something like the patch attached resolves the error, but this would probably benefit from unit tests too.

[danielbachhuber]

Actually, it looks like there are already unit tests for this. I'll see if I can track down further why they don't fail when I have a moment.

[nacin]

Patch is incorrect; this is a case of taking $q and replacing it with $this->query_vars. $this->query_vars['meta_key'] is correct there, not 'meta_key'.

[nacin]

In 23325:

Comment Query: Use $this->query_vars instead of the nonexistent shorthand $q. see #23208.

[nacin]

In 23332:

Comment Query: Use $this->query_vars instead of the nonexistent shorthand $q.

Merges [23325] to the 3.5 branch.
fixes #23208.

[danielbachhuber]

No props?

[SergeyBiryukov]

In 1191/tests:

Comment meta query tests for ordering by meta key. see #23208.

[SergeyBiryukov]

Replying to danielbachhuber:

Actually, it looks like there are already unit tests for this. I'll see if I can track down further why they don't fail when I have a moment.

The tests only had assertions for ordering by meta value. To trigger the bug, you need to order by meta key, which is functionally the same.