sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove redundant table alias check in WP_Meta_Query.

Browse Source 
Also adds documentation for 'meta_query_find_compatible_table_alias' filter.

See #24093.

git-svn-id: https://develop.svn.wordpress.org/trunk@29953 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2014-10-18 02:21:33 +00:00
parent 49c33927b5
commit 17183e4e71
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wp-includes/meta.php
View File

@ -1331,18 +1331,12 @@ class WP_Meta_Query {
$join .= " LEFT JOIN $this->meta_table"; $join .= " LEFT JOIN $this->meta_table";
$join .= $i ? " AS $alias" : ''; $join .= $i ? " AS $alias" : '';
$join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] ); $join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
$sql_chunks['join'][] = $join;
// All other JOIN clauses. // All other JOIN clauses.
} else { } else {
$alias = $this->find_compatible_table_alias( $clause, $parent_query ); $join .= " INNER JOIN $this->meta_table";
if ( false === $alias ) { $join .= $i ? " AS $alias" : '';
$alias = $i ? 'mt' . $i : $this->meta_table; $join .= " ON ( $this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column )";
$join .= " INNER JOIN $this->meta_table";
$join .= $i ? " AS $alias" : '';
$join .= " ON ( $this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column )";
}
} }
$this->table_aliases[] = $alias; $this->table_aliases[] = $alias;
@ -1469,6 +1463,16 @@ class WP_Meta_Query {
} }
} }
/**
* Filter the table alias identified as compatible with the current clause.
*
* @since 4.1.0
*
* @param string|bool $alias Table alias, or false if none was found.
* @param array $clause First-order query clause.
* @param array $parent_query Parent of $clause.
* @param object $this WP_Meta_Query object.
*/
return apply_filters( 'meta_query_find_compatible_table_alias', $alias, $clause, $parent_query, $this ) ; return apply_filters( 'meta_query_find_compatible_table_alias', $alias, $clause, $parent_query, $this ) ;
} }
} }