From f90a558df4d8f979a5b3ddd743e1626937cfac72 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sun, 4 May 2014 23:07:14 +0000 Subject: [PATCH] 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. Built from https://develop.svn.wordpress.org/trunk@28252 git-svn-id: http://core.svn.wordpress.org/trunk@28080 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/date.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/wp-includes/date.php b/wp-includes/date.php index 99bbb4e012..2f30fd53f2 100644 --- a/wp-includes/date.php +++ b/wp-includes/date.php @@ -256,16 +256,12 @@ class WP_Date_Query { 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"; if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )