Changeset 16143 for trunk/wp-includes/class-wp-object-query.php

Timestamp:

11/01/2010 08:34:54 PM (14 years ago)

Author:

scribu

Message:

Just pass meta type to get_meta_sql(). See #15032

File:

• trunk/wp-includes/class-wp-object-query.php (modified) (2 diffs)

trunk/wp-includes/class-wp-object-query.php

@@ -88 +88 @@
      *      Default: 'CHAR'
      *
+     * @param string $meta_type
      * @param string $primary_table
      * @param string $primary_id_column
-     * @param string $meta_table
-     * @param string $meta_id_column
      * @return array( $join_sql, $where_sql )
      */
-    function get_meta_sql( $meta_query, $primary_table, $primary_id_column, $meta_table, $meta_id_column ) {
+    function get_meta_sql( $meta_query, $meta_type, $primary_table, $primary_id_column ) {
         global $wpdb;
+
+        if ( ! $meta_table = _get_meta_table( $meta_type ) )
+            return false;
+
+        $meta_id_column = esc_sql( $meta_type . '_id' );
 
         $clauses = array();
@@ -158 +162 @@
         }
 
-        return apply_filters( 'get_meta_sql', compact( 'join', 'where' ), $meta_query, $primary_table, $primary_id_column, $meta_table, $meta_id_column );
+        return apply_filters( 'get_meta_sql', compact( 'join', 'where' ), $meta_query, $meta_type, $primary_table, $primary_id_column );
     }