Ticket #18828: 18828.2.diff

src/wp-includes/taxonomy.php

@@ -2693 +2693 @@
         if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) )
                 $order = 'ASC';
 
-        $taxonomies = "'" . implode("', '", $taxonomies) . "'";
-        $object_ids = implode(', ', $object_ids);
+        $_taxonomies = "'" . implode("', '", $taxonomies) . "'";
+        $_object_ids = implode(', ', $object_ids);
 
         $select_this = '';
         if ( 'all' == $fields ) {
@@ -2710 +2710 @@
         }
 
         $where = array(
-                "tt.taxonomy IN ($taxonomies)",
-                "tr.object_id IN ($object_ids)",
+                "tt.taxonomy IN ($_taxonomies)",
+                "tr.object_id IN ($_object_ids)",
         );
 
         if ( '' !== $args['parent'] ) {
@@ -2739 +2739 @@
                 }
                 $terms = array_merge( $terms, $_terms );
         } elseif ( 'tt_ids' == $fields ) {
-                $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
+                $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($_object_ids) AND tt.taxonomy IN ($_taxonomies) $orderby $order");
                 foreach ( $terms as $key => $tt_id ) {
                         $terms[$key] = sanitize_term_field( 'term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw' ); // 0 should be the term id, however is not needed when using raw context.
                 }
@@ -2767 +2767 @@
          *
          * @since 2.8.0
          *
-         * @param array        $terms      An array of terms for the given object or objects.
-         * @param array|int    $object_ids Object ID or array of IDs.
-         * @param array|string $taxonomies A taxonomy or array of taxonomies.
-         * @param array        $args       An array of arguments for retrieving terms for
-         *                                 the given object(s).
+         * @param array  $terms      An array of terms for the given object or objects.
+         * @param array  $object_ids Object ID or array of IDs.
+         * @param array  $taxonomies A taxonomy or array of taxonomies.
+         * @param array  $args       An array of arguments for retrieving terms for
+         *                           the given object(s).
          */
         return apply_filters( 'wp_get_object_terms', $terms, $object_ids, $taxonomies, $args );
 }