Changeset 31251 for trunk

Timestamp:

01/20/2015 07:12:48 PM (12 years ago)

Author:

boonebgorges

Message:

WP_Date_Query date validation should not fail for hour = 0.

Props ChriCo, tyxla.
Fixes #31067 for trunk.

Location:

trunk

Files:

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

trunk/src/wp-includes/date.php

@@ -369 +369 @@
                 // Hours per day.
                 $min_max_checks['hour'] = array(
-                        'min' => 1,
+                        'min' => 0,
                         'max' => 23
                 );
@@ -395 +395 @@
                                 $is_between = $_value >= $check['min'] && $_value <= $check['max'];
 
-                                if ( ! $is_between ) {
+                                if ( ! is_numeric( $_value ) || ! $is_between ) {
                                         $error = sprintf(
                                                 /* translators: Date query invalid date message: 1: invalid value, 2: type of value, 3: minimum valid value, 4: maximum valid value */

trunk/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 ) ) );