Changeset 28935 for trunk/src/wp-includes/date.php

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.

File:

• trunk/src/wp-includes/date.php (modified) (3 diffs)

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