Changeset 38280

Timestamp:

08/18/2016 07:47:15 PM (10 years ago)

Author:

wonderboymusic

Message:

Query: use composition for $db in WP_Date_Query, removes need to import global $wpdb in multiple methods.

See #37699.

File:

• trunk/src/wp-includes/date.php (modified) (9 diffs)

trunk/src/wp-includes/date.php

@@ -62 +62 @@
          */
         public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' );
+
+        /**
+         * @since 4.7.0
+         * @access protected
+         * @var wpdb
+         */
+        protected $db;
 
         /**
@@ -152 +159 @@
          */
         public function __construct( $date_query, $default_column = 'post_date' ) {
+                $this->db = $GLOBALS['wpdb'];
 
                 if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
@@ -487 +495 @@
          */
         public function validate_column( $column ) {
-                global $wpdb;
-
                 $valid_columns = array(
                         'post_date', 'post_date_gmt', 'post_modified',
@@ -513 +519 @@
 
                         $known_columns = array(
-                                $wpdb->posts => array(
+                                $this->db->posts => array(
                                         'post_date',
                                         'post_date_gmt',
@@ -519 +525 @@
                                         'post_modified_gmt',
                                 ),
-                                $wpdb->comments => array(
+                                $this->db->comments => array(
                                         'comment_date',
                                         'comment_date_gmt',
                                 ),
-                                $wpdb->users => array(
+                                $this->db->users => array(
                                         'user_registered',
                                 ),
-                                $wpdb->blogs => array(
+                                $this->db->blogs => array(
                                         'registered',
                                         'last_updated',
@@ -718 +724 @@
          */
         protected function get_sql_for_clause( $query, $parent_query ) {
-                global $wpdb;
-
                 // The sub-parts of a $where part.
                 $where_parts = array();
@@ -741 +745 @@
 
                 // Range queries.
-                if ( ! empty( $query['after'] ) )
-                        $where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
-
-                if ( ! empty( $query['before'] ) )
-                        $where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
-
+                if ( ! empty( $query['after'] ) ) {
+                        $where_parts[] = $this->db->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+                }
+                if ( ! empty( $query['before'] ) ) {
+                        $where_parts[] = $this->db->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+                }
                 // Specific value queries.
 
@@ -959 +963 @@
          */
         public function build_time_query( $column, $compare, $hour = null, $minute = null, $second = null ) {
-                global $wpdb;
-
                 // Have to have at least one
                 if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
@@ -1014 +1016 @@
                 }
 
-                return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
+                return $this->db->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
         }
 }