Changeset 38079 for trunk/src/wp-includes/class-wp-tax-query.php

Timestamp:

07/17/2016 04:32:50 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Taxonomy: Correct WP_Error usage in WP_Tax_Query::clean_query() and WP_Tax_Query::transform_query().

Fixes #37389.

File:

• trunk/src/wp-includes/class-wp-tax-query.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-tax-query.php

@@ -563 +563 @@
                 if ( empty( $query['taxonomy'] ) ) {
                         if ( 'term_taxonomy_id' !== $query['field'] ) {
-                                $query = new WP_Error( 'Invalid taxonomy' );
+                                $query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
                                 return;
                         }
@@ -570 +570 @@
                         $query['include_children'] = false;
                 } elseif ( ! taxonomy_exists( $query['taxonomy'] ) ) {
-                        $query = new WP_Error( 'Invalid taxonomy' );
+                        $query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
                         return;
                 }
@@ -656 +656 @@
 
                 if ( 'AND' == $query['operator'] && count( $terms ) < count( $query['terms'] ) ) {
-                        $query = new WP_Error( 'Inexistent terms' );
+                        $query = new WP_Error( 'inexistent_terms', __( 'Inexistent terms.' ) );
                         return;
                 }