Changeset 25139

Timestamp:

08/27/2013 04:38:32 PM (13 years ago)

Author:

nacin

Message:

WP_Date_Query.

props Viper007Bond.
see #18694.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (3 diffs)
• src/wp-includes/date.php (added)
• src/wp-includes/query.php (modified) (4 diffs)
• src/wp-settings.php (modified) (1 diff)
• tests/tests/comment/dateQuery.php (added)
• tests/tests/query/date.php (added)
• tests/tests/query/dateQuery.php (added)

trunk/src/wp-includes/comment.php

@@ -196 +196 @@
          */
         var $meta_query = false;
+
+        /**
+         * Date query container
+         *
+         * @since 3.7.0
+         * @access public
+         * @var object WP_Date_Query
+         */
+        var $date_query = false;
 
         /**
@@ -232 +241 @@
                         'meta_value' => '',
                         'meta_query' => '',
+                        'date_query' => null, // See WP_Date_Query
                 );
 
@@ -361 +371 @@
                 }
 
+                if ( ! empty( $date_query ) && is_array( $date_query ) ) {
+                        $date_query_object = new WP_Date_Query( $date_query, 'comment_date' );
+                        $where .= $date_query_object->get_sql();
+                }
+
                 $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits', 'groupby' );
                 $clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );

trunk/src/wp-includes/query.php

@@ -866 +866 @@
          */
         var $meta_query = false;
+
+        /**
+         * Date query container
+         *
+         * @since 3.7.0
+         * @access public
+         * @var object WP_Date_Query
+         */
+        var $date_query = false;
 
         /**
@@ -2046 +2055 @@
                         $where .= " AND $wpdb->posts.menu_order = " . $q['menu_order'];
 
-                // If a month is specified in the querystring, load that month
+                // The "m" parameter is meant for months but accepts datetimes of varying specificity
                 if ( $q['m'] ) {
                         $where .= " AND YEAR($wpdb->posts.post_date)=" . substr($q['m'], 0, 4);
@@ -2061 +2070 @@
                 }
 
+                // Handle the other individual date parameters
+                $date_parameters = array();
+
                 if ( '' !== $q['hour'] )
-                        $where .= " AND HOUR($wpdb->posts.post_date)='" . $q['hour'] . "'";
+                        $date_parameters['hour'] = $q['hour'];
 
                 if ( '' !== $q['minute'] )
-                        $where .= " AND MINUTE($wpdb->posts.post_date)='" . $q['minute'] . "'";
+                        $date_parameters['minute'] = $q['minute'];
 
                 if ( '' !== $q['second'] )
-                        $where .= " AND SECOND($wpdb->posts.post_date)='" . $q['second'] . "'";
+                        $date_parameters['second'] = $q['second'];
 
                 if ( $q['year'] )
-                        $where .= " AND YEAR($wpdb->posts.post_date)='" . $q['year'] . "'";
+                        $date_parameters['year'] = $q['year'];
 
                 if ( $q['monthnum'] )
-                        $where .= " AND MONTH($wpdb->posts.post_date)='" . $q['monthnum'] . "'";
+                        $date_parameters['monthnum'] = $q['monthnum'];
+
+                if ( $q['w'] )
+                        $date_parameters['week'] = $q['w'];
 
                 if ( $q['day'] )
-                        $where .= " AND DAYOFMONTH($wpdb->posts.post_date)='" . $q['day'] . "'";
+                        $date_parameters['day'] = $q['day'];
+
+                if ( $date_parameters ) {
+                        $date_query = new WP_Date_Query( array( $date_parameters ) );
+                        $where .= $date_query->get_sql();
+                }
+                unset( $date_parameters, $date_query );
+
+                // Handle complex date queries
+                if ( ! empty( $q['date_query'] ) ) {
+                        $this->date_query = new WP_Date_Query( $q['date_query'] );
+                        $where .= $this->date_query->get_sql();
+                }
+
 
                 // If we've got a post_type AND it's not "any" post_type.
@@ -2147 +2175 @@
                 }
 
-                if ( $q['w'] )
-                        $where .= ' AND ' . _wp_mysql_week( "`$wpdb->posts`.`post_date`" ) . " = '" . $q['w'] . "'";
 
                 if ( intval($q['comments_popup']) )

trunk/src/wp-settings.php

@@ -108 +108 @@
 require( ABSPATH . WPINC . '/capabilities.php' );
 require( ABSPATH . WPINC . '/query.php' );
+require( ABSPATH . WPINC . '/date.php' );
 require( ABSPATH . WPINC . '/theme.php' );
 require( ABSPATH . WPINC . '/class-wp-theme.php' );