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

Timestamp:

05/04/2014 11:06:07 PM (11 years ago)

Author:

wonderboymusic

Message:

In WP_Date_Query::get_sql_for_subquery(), don't parse duplicate parameters - only parse one of w and week or month and monthnum.

Adds unit tests.

Props oso96_2000, ChriCo.
Fixes #25835.

File:

• trunk/src/wp-includes/date.php (modified) (1 diff)

trunk/src/wp-includes/date.php

@@ -257 +257 @@
         if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) )
             $where_parts[] = "MONTH( $column ) $compare $value";
-
-        // Legacy
-        if ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) )
+        else if ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) )
             $where_parts[] = "MONTH( $column ) $compare $value";
 
         if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) )
             $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
-
-        // Legacy
-        if ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) )
+        else if ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) )
             $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";