Changeset 38768 for trunk/src/wp-includes/date.php

Timestamp:

10/10/2016 06:37:02 AM (9 years ago)

Author:

pento

Message:

General: Restore usage of $wpdb, instead of $this->db.

Hiding the $wpdb global behind a property decreases the readability of the code, as well as causing irrelevant output when dumping an object.

Reverts [38275], [38278], [38279], [38280], [38387].
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;
 
     /**
@@ -159 +152 @@
      */
     public function __construct( $date_query, $default_column = 'post_date' ) {
-        $this->db = $GLOBALS['wpdb'];
-
         if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
             $this->relation = 'OR';
@@ -495 +486 @@
      */
     public function validate_column( $column ) {
+        global $wpdb;
+
         $valid_columns = array(
             'post_date', 'post_date_gmt', 'post_modified',
@@ -519 +512 @@
 
             $known_columns = array(
-                $this->db->posts => array(
+                $wpdb->posts => array(
                     'post_date',
                     'post_date_gmt',
@@ -525 +518 @@
                     'post_modified_gmt',
                 ),
-                $this->db->comments => array(
+                $wpdb->comments => array(
                     'comment_date',
                     'comment_date_gmt',
                 ),
-                $this->db->users => array(
+                $wpdb->users => array(
                     'user_registered',
                 ),
-                $this->db->blogs => array(
+                $wpdb->blogs => array(
                     'registered',
                     'last_updated',
@@ -724 +717 @@
      */
     protected function get_sql_for_clause( $query, $parent_query ) {
+        global $wpdb;
+
         // The sub-parts of a $where part.
         $where_parts = array();
@@ -746 +741 @@
         // Range queries.
         if ( ! empty( $query['after'] ) ) {
-            $where_parts[] = $this->db->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'] ) ) {
-            $where_parts[] = $this->db->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.
@@ -963 +958 @@
      */
     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 ) )
@@ -1016 +1013 @@
         }
 
-        return $this->db->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
+        return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
     }
 }