Ticket #16825: mypatch.diff

Users/beapi/SVN/WPTrunk/trunk/wp-includes/meta.php

@@ -368 +368 @@
  *              Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
  *              Default: 'CHAR'
  *
- * @param string $meta_type
+ * @param string $table_meta_type
  * @param string $primary_table
  * @param string $primary_id_column
  * @param object $context (optional) The main query object
  * @return array( 'join' => $join_sql, 'where' => $where_sql )
  */
-function _get_meta_sql( $meta_query, $meta_type, $primary_table, $primary_id_column, $context = null ) {
+function _get_meta_sql( $meta_query, $table_meta_type, $primary_table, $primary_id_column, $context = null ) {
         global $wpdb;
 
-        if ( ! $meta_table = _get_meta_table( $meta_type ) )
+        if ( ! $table_meta_type = _get_meta_table( $table_meta_type ) )
                 return false;
 
-        $meta_id_column = esc_sql( $meta_type . '_id' );
+        $meta_id_column = esc_sql( $table_meta_type . '_id' );
 
         $join = '';
         $where = '';
@@ -442 +442 @@
                 $where .= $wpdb->prepare( " AND CAST($alias.meta_value AS {$meta_type}) {$meta_compare} {$meta_compare_string}", $meta_value );
         }
 
-        return apply_filters_ref_array( 'get_meta_sql', array( compact( 'join', 'where' ), $meta_query, $meta_type, $primary_table, $primary_id_column, &$context ) );
+        return apply_filters_ref_array( 'get_meta_sql', array( compact( 'join', 'where' ), $meta_query, $table_meta_type, $primary_table, $primary_id_column, &$context ) );
 }
 
 /**