Changeset 28935

Timestamp:

07/01/2014 01:17:39 AM (12 years ago)

Author:

SergeyBiryukov

Message:

WP_Date_Query: The inclusive logic should include all times within the date range.

props mboynes, oso96_2000, DrewAPicture.
fixes #26653.

Location:

trunk

Files:

• src/wp-includes/date.php (modified) (3 diffs)
• tests/phpunit/tests/query/dateQuery.php (modified) (1 diff)

trunk/src/wp-includes/date.php

@@ -48 +48 @@
         /**
          * Constructor.
+         *
+         * @since 3.7.0
+         * @since 4.0.0 The $inclusive logic was updated to include all times within the date range.
          *
          * @param array $date_query {
@@ -236 +239 @@
                 $compare = $this->get_compare( $query );
 
+                $inclusive = ! empty( $query['inclusive'] );
+
+                // Assign greater- and less-than values.
                 $lt = '<';
                 $gt = '>';
-                if ( ! empty( $query['inclusive'] ) ) {
+
+                if ( $inclusive ) {
                         $lt .= '=';
                         $gt .= '=';
@@ -245 +252 @@
                 // Range queries
                 if ( ! empty( $query['after'] ) )
-                        $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], true ) );
+                        $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
 
                 if ( ! empty( $query['before'] ) )
-                        $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], false ) );
+                        $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
 
                 // Specific value queries

trunk/tests/phpunit/tests/query/dateQuery.php

@@ -255 +255 @@
         }
 
+        /**
+         * @ticket 26653
+         */
+        public function test_date_query_inclusive_between_dates() {
+                $posts = $this->_get_query_result( array(
+                        'date_query' => array(
+                                'after' => array(
+                                        'year' => 2007,
+                                        'month' => 1
+                                ),
+                                'before' => array(
+                                        'year' => 2008,
+                                        'month' => 12
+                                ),
+                                'inclusive' => true
+                        ),
+                ) );
+
+
+                $expected_dates = array(
+                        '2007-01-22 03:49:21',
+                        '2007-05-16 17:32:22',
+                        '2007-09-24 07:17:23',
+                        '2008-03-29 09:04:25',
+                        '2008-07-15 11:32:26',
+                        '2008-12-10 13:06:27',
+                );
+
+                $this->assertEquals( $expected_dates, wp_list_pluck( $posts, 'post_date' ) );
+        }
+
         public function test_date_query_year_expecting_results() {
                 $posts = $this->_get_query_result( array(