Ticket #42883: 42883.diff

src/wp-includes/date.php

@@ -738 +738 @@
                         $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
                 }
                 // Specific value queries.
-
-                if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) ) {
-                        $where_parts[] = "YEAR( $column ) $compare $value";
+    
+                if ( isset( $query['year'] ) && $value = $this->build_year( $compare, $column, $query['year'] ) ) {
+                        $where_parts[] = $value;
                 }
 
                 if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
@@ -848 +848 @@
                 }
         }
 
+        /**
+         * Builds and validates a year string based on the comparison operator.
+         *
+         * @since 5.0.0
+         *
+         * @param string $compare The compare operator to use
+         * @param string|array $value The value
+         * @return string|false|int The value to be used in SQL or false on error.
+         */
+        public function build_year( $compare, $column, $value ) {
+                if ( ! isset( $value ) ) {
+                        return false;
+                }
+
+                switch ( $compare ) {
+                        case 'IN':
+                        case 'NOT IN':
+                                $value = (array) $value;
+
+                                // Remove non-numeric values.
+                                $value = array_filter( $value, 'is_numeric' );
+
+                                if ( empty( $value ) ) {
+                                        return false;
+                                }
+
+                                return $column . $compare . 'DATE(' . implode( ',', array_map( 'intval', $value ) ) . '-01-01)';
+
+                        case 'BETWEEN':
+                        case 'NOT BETWEEN':
+                                if ( ! is_array( $value ) || 2 != count( $value ) ) {
+                                        $value = array( $value, $value );
+                                } else {
+                                        $value = array_values( $value );
+                                }
+
+                                // If either value is non-numeric, bail.
+                                foreach ( $value as $v ) {
+                                        if ( ! is_numeric( $v ) ) {
+                                                return false;
+                                        }
+                                }
+
+                                $value = array_map( 'intval', $value );
+
+                                return $column . ' >= DATE("' . $value[0] . '-01-01") AND ' . $column . ' < DATE("' . $value[1] . '-01-01")';
+
+                        default:
+                                if ( ! is_numeric( $value ) ) {
+                                        return false;
+                                }
+
+                                return (int) $value;
+                }
+        }
+  
         /**
          * Builds a MySQL format date/time based on some query parameters.
          *