Changeset 31377 for branches/4.1

Timestamp:

02/09/2015 02:32:31 AM (12 years ago)

Author:

dd32

Message:

WP_Date_Query date validation should not fail for hour = 0.

Props ChriCo, tyxla.
Merges [31251] to the 4.1 branch.
Fixes #31067.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-includes/date.php (modified) (2 diffs)
• tests/phpunit/tests/date/query.php (modified) (2 diffs)

branches/4.1/src/wp-includes/date.php

@@ -361 +361 @@
                 // Hours per day.
                 $min_max_checks['hour'] = array(
-                        'min' => 1,
+                        'min' => 0,
                         'max' => 23
                 );
@@ -385 +385 @@
                         $is_between = $date_query[ $key ] >= $check['min'] && $date_query[ $key ] <= $check['max'];
 
-                        if ( ! $is_between ) {
+                        if ( ! is_numeric( $date_query[ $key ] ) || ! $is_between ) {
 
                                 $error = sprintf(

branches/4.1/tests/phpunit/tests/date/query.php

@@ -858 +858 @@
         public function test_validate_date_values_hour() {
                 // Valid values.
-                $hours = range( 1, 23 );
+                $hours = range( 0, 23 );
                 foreach ( $hours as $hour ) {
                         $this->assertTrue( $this->q->validate_date_values( array( 'hour' => $hour ) ) );
@@ -864 +864 @@
 
                 // Invalid values.
-                $hours = array( -1, 24, 25, 'string who wants to be a int' );
+                $hours = array( -1, 24, 25, 'string' );
                 foreach ( $hours as $hour ) {
                         $this->assertFalse( $this->q->validate_date_values( array( 'hour' => $hour ) ) );