Changeset 16353

Timestamp:

11/13/2010 06:32:43 PM (14 years ago)

Author:

scribu

Message:

Kill WP_Object_Query. See #15032

Location:

trunk

Files:

• wp-includes/class-wp-object-query.php (deleted)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/meta.php (modified) (1 diff)
• wp-includes/query.php (modified) (2 diffs)
• wp-includes/user.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/comment.php

@@ -198 +198 @@
  * @since 3.1.0
  */
-class WP_Comment_Query extends WP_Object_Query {
+class WP_Comment_Query {
 
     /**

trunk/wp-includes/meta.php

@@ -445 +445 @@
 }
 
+/*
+ * Populates the $meta_query property
+ *
+ * @access private
+ * @since 3.1.0
+ *
+ * @param array $qv The query variables
+ */
+function _parse_meta_query( &$qv ) {
+    $meta_query = array();
+
+    // Simple query needs to be first for orderby=meta_value to work correctly
+    foreach ( array( 'key', 'value', 'compare', 'type' ) as $key ) {
+        if ( !empty( $qv[ "meta_$key" ] ) )
+            $meta_query[0][ $key ] = $qv[ "meta_$key" ];
+    }
+
+    if ( !empty( $qv['meta_query'] ) && is_array( $qv['meta_query'] ) ) {
+        $meta_query = array_merge( $meta_query, $qv['meta_query'] );
+    }
+
+    $qv['meta_query'] = $meta_query;
+}
+
 /**
  * Retrieve the name of the metadata table for the specified object type.

trunk/wp-includes/query.php

@@ -689 +689 @@
  * @since 1.5.0
  */
-class WP_Query extends WP_Object_Query {
+class WP_Query {
 
     /**
@@ -1348 +1348 @@
             $this->parse_tax_query( $qv );
 
-            $this->parse_meta_query( $qv );
+            _parse_meta_query( $qv );
 
             if ( empty($qv['author']) || ($qv['author'] == '0') ) {

trunk/wp-includes/user.php

@@ -331 +331 @@
  * @since 3.1.0
  */
-class WP_User_Query extends WP_Object_Query {
+class WP_User_Query {
 
     /**
@@ -464 +464 @@
         }
 
-        $this->parse_meta_query( $qv );
+        _parse_meta_query( $qv );
 
         $role = trim( $qv['role'] );

trunk/wp-settings.php

@@ -104 +104 @@
 require( ABSPATH . WPINC . '/class-wp-walker.php' );
 require( ABSPATH . WPINC . '/class-wp-ajax-response.php' );
-require( ABSPATH . WPINC . '/class-wp-object-query.php' );
 require( ABSPATH . WPINC . '/formatting.php' );
 require( ABSPATH . WPINC . '/capabilities.php' );