Ticket #21621: 21621.diff

wp-includes/meta.php

@@ -604 +604 @@
 }
 
 /**
+ * Given a meta type, return the appropriate alias if applicable
+ *
+ * @since 3.7.0
+ *
+ * @see WP_Meta_Query
+ *
+ * @param string $type MySQL type to cast meta_value
+ * @return string MySQL type
+ */
+function get_meta_type( $type = '' ) {
+        if ( empty( $type ) )
+                return 'CHAR';
+
+        $meta_type = strtoupper( $type );
+
+        if ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED', 'NUMERIC' ) ) )
+                return 'CHAR';
+
+        if ( 'NUMERIC' == $meta_type )
+                $meta_type = 'SIGNED';
+
+        return $meta_type;
+}
+/**
  * Container class for a multiple metadata query
  *
  * @since 3.2.0
@@ -720 +744 @@
                                 $key_only_queries[$k] = $q;
                                 unset( $this->queries[$k] );
                         }
-                }               
-                
+                }
+
                 // Split out the meta_key only queries (we can only do this for OR)
                 if ( 'OR' == $this->relation ) {
                         foreach ( $this->queries as $k => $q ) {
@@ -744 +768 @@
 
                 foreach ( $queries as $k => $q ) {
                         $meta_key = isset( $q['key'] ) ? trim( $q['key'] ) : '';
-                        $meta_type = isset( $q['type'] ) ? strtoupper( $q['type'] ) : 'CHAR';
-
-                        if ( 'NUMERIC' == $meta_type )
-                                $meta_type = 'SIGNED';
-                        elseif ( ! in_array( $meta_type, array( 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED' ) ) )
-                                $meta_type = 'CHAR';
+                        $meta_type = get_meta_type( isset( $q['type'] ) ? $q['type'] : '' );
 
                         $meta_value = isset( $q['value'] ) ? $q['value'] : null;
 

wp-includes/query.php

@@ -2388 +2388 @@
                                                 break;
                                         case $q['meta_key']:
                                         case 'meta_value':
-                                                $orderby = "$wpdb->postmeta.meta_value";
+                                                if ( isset( $q['meta_type'] ) ) {
+                                                        $meta_type = get_meta_type( $q['meta_type'] );
+                                                        $orderby = "CAST($wpdb->postmeta.meta_value AS {$meta_type})";
+                                                } else {
+                                                        $orderby = "$wpdb->postmeta.meta_value";
+                                                }       
                                                 break;
                                         case 'meta_value_num':
                                                 $orderby = "$wpdb->postmeta.meta_value+0";