WordPress 4.4

[autoinstalls/wordpress.git] / wp-includes / date.php

diff --git a/wp-includes/date.php b/wp-includes/date.php
index 2e903a2518e4bdfeba83b016a628af8ead57a778..e10ef4f861e3e8082be1864a0700b91cbe7149a5 100644 (file)
--- a/wp-includes/date.php
+++ b/wp-includes/date.php
@@ -355,10 +355,11 @@ class WP_Date_Query {
 
                // Weeks per year.
                if ( isset( $_year ) ) {
 
                // Weeks per year.
                if ( isset( $_year ) ) {

-                       // If we have a specific year, use it to calculate number of weeks.
-                       $date = new DateTime();
-                       $date->setISODate( $_year, 53 );
-                       $week_count = $date->format( "W" ) === "53" ? 53 : 52;
+                       /*
+                        * If we have a specific year, use it to calculate number of weeks.
+                        * Note: the number of weeks in a year is the date in which Dec 28 appears.
+                        */
+                       $week_count = date( 'W', mktime( 0, 0, 0, 12, 28, $_year ) );

 
                } else {
                        // Otherwise set the week-count to a maximum of 53.
 
                } else {
                        // Otherwise set the week-count to a maximum of 53.


@@ -991,7 +992,7 @@ class WP_Date_Query {
                $format = $time = '';
 
                // Hour
                $format = $time = '';
 
                // Hour

-               if ( $hour ) {
+               if ( null !== $hour ) {

                        $format .= '%H.';
                        $time   .= sprintf( '%02d', $hour ) . '.';
                } else {
                        $format .= '%H.';
                        $time   .= sprintf( '%02d', $hour ) . '.';
                } else {