WordPress 4.7

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

diff --git a/wp-includes/date.php b/wp-includes/date.php
index e10ef4f861e3e8082be1864a0700b91cbe7149a5..c7d6b0409c5822c328ae0c6a78e89540666b0987 100644 (file)
--- a/wp-includes/date.php
+++ b/wp-includes/date.php
@@ -2,13 +2,13 @@
 /**
  * Class for generating SQL clauses that filter a primary query according to date.
  *
 /**
  * Class for generating SQL clauses that filter a primary query according to date.
  *

- * `WP_Date_Query` is a helper that allows primary query classes, such as {@see WP_Query},
- * to filter their results by date columns, by generating `WHERE` subclauses to be attached
- * to the primary SQL query string.
+ * WP_Date_Query is a helper that allows primary query classes, such as WP_Query, to filter
+ * their results by date columns, by generating `WHERE` subclauses to be attached to the
+ * primary SQL query string.

  *
  * Attempting to filter by an invalid date value (eg month=13) will generate SQL that will
  * return no results. In these cases, a _doing_it_wrong() error notice is also thrown.
  *
  * Attempting to filter by an invalid date value (eg month=13) will generate SQL that will
  * return no results. In these cases, a _doing_it_wrong() error notice is also thrown.

- * See {@link WP_Date_Query::validate_date_values()}.
+ * See WP_Date_Query::validate_date_values().

  *
  * @link https://codex.wordpress.org/Function_Reference/WP_Query Codex page.
  *
  *
  * @link https://codex.wordpress.org/Function_Reference/WP_Query Codex page.
  *


@@ -18,7 +18,7 @@ class WP_Date_Query {
        /**
         * Array of date queries.
         *
        /**
         * Array of date queries.
         *

-        * See {@see WP_Date_Query::__construct()} for information on date query arguments.
+        * See WP_Date_Query::__construct() for information on date query arguments.

         *
         * @since 3.7.0
         * @access public
         *
         * @since 3.7.0
         * @access public


@@ -151,7 +151,6 @@ class WP_Date_Query {
         *                              'comment_date', 'comment_date_gmt'.
         */
        public function __construct( $date_query, $default_column = 'post_date' ) {
         *                              'comment_date', 'comment_date_gmt'.
         */
        public function __construct( $date_query, $default_column = 'post_date' ) {

-

                if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
                        $this->relation = 'OR';
                } else {
                if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
                        $this->relation = 'OR';
                } else {


@@ -491,13 +490,13 @@ class WP_Date_Query {
                $valid_columns = array(
                        'post_date', 'post_date_gmt', 'post_modified',
                        'post_modified_gmt', 'comment_date', 'comment_date_gmt',
                $valid_columns = array(
                        'post_date', 'post_date_gmt', 'post_modified',
                        'post_modified_gmt', 'comment_date', 'comment_date_gmt',

-                       'user_registered',
+                       'user_registered', 'registered', 'last_updated',

                );
 
                // Attempt to detect a table prefix.
                if ( false === strpos( $column, '.' ) ) {
                        /**
                );
 
                // Attempt to detect a table prefix.
                if ( false === strpos( $column, '.' ) ) {
                        /**

-                        * Filter the list of valid date query columns.
+                        * Filters the list of valid date query columns.

                         *
                         * @since 3.7.0
                         * @since 4.1.0 Added 'user_registered' to the default recognized columns.
                         *
                         * @since 3.7.0
                         * @since 4.1.0 Added 'user_registered' to the default recognized columns.


@@ -525,6 +524,10 @@ class WP_Date_Query {
                                $wpdb->users => array(
                                        'user_registered',
                                ),
                                $wpdb->users => array(
                                        'user_registered',
                                ),

+                               $wpdb->blogs => array(
+                                       'registered',
+                                       'last_updated',
+                               ),

                        );
 
                        // If it's a known column name, add the appropriate table prefix.
                        );
 
                        // If it's a known column name, add the appropriate table prefix.


@@ -555,7 +558,7 @@ class WP_Date_Query {
                $where = $sql['where'];
 
                /**
                $where = $sql['where'];
 
                /**

-                * Filter the date query WHERE clause.
+                * Filters the date query WHERE clause.

                 *
                 * @since 3.7.0
                 *
                 *
                 * @since 3.7.0
                 *


@@ -568,8 +571,8 @@ class WP_Date_Query {
        /**
         * Generate SQL clauses to be appended to a main query.
         *
        /**
         * Generate SQL clauses to be appended to a main query.
         *

-        * Called by the public {@see WP_Date_Query::get_sql()}, this method
-        * is abstracted out to maintain parity with the other Query classes.
+        * Called by the public WP_Date_Query::get_sql(), this method is abstracted
+        * out to maintain parity with the other Query classes.

         *
         * @since 4.1.0
         * @access protected
         *
         * @since 4.1.0
         * @access protected


@@ -736,12 +739,12 @@ class WP_Date_Query {
                }
 
                // Range queries.
                }
 
                // Range queries.

-               if ( ! empty( $query['after'] ) )
+               if ( ! empty( $query['after'] ) ) {

                        $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
                        $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );

-
-               if ( ! empty( $query['before'] ) )
+               }
+               if ( ! empty( $query['before'] ) ) {

                        $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
                        $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );

-
+               }

                // Specific value queries.
 
                if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
                // Specific value queries.
 
                if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )


@@ -853,7 +856,7 @@ class WP_Date_Query {
         *
         * You can pass an array of values (year, month, etc.) with missing parameter values being defaulted to
         * either the maximum or minimum values (controlled by the $default_to parameter). Alternatively you can
         *
         * You can pass an array of values (year, month, etc.) with missing parameter values being defaulted to
         * either the maximum or minimum values (controlled by the $default_to parameter). Alternatively you can

-        * pass a string that that will be run through strtotime().
+        * pass a string that will be run through strtotime().

         *
         * @since 3.7.0
         * @access public
         *
         * @since 3.7.0
         * @access public