Changeset 40291 for branches/4.7

Timestamp:

03/14/2017 06:42:57 PM (9 years ago)

Author:

boonebgorges

Message:

Fix the formatting of $taxonomies parameter of 'wp_get_object_terms' filter.

[38667] changed the way that the filter parameters are built. That
changeset didn't fully account for the pre-4.7 format of $taxonomies.

Merge of [40290] to the 4.7 branch.

Props ig_communitysites.
Fixes #40154.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term/wpGetObjectTerms.php (modified) (1 diff)

branches/4.7/src/wp-includes/taxonomy.php

@@ -1893 +1893 @@
 
         $object_ids = implode( ',', $object_ids );
-        $taxonomies = implode( ',', $taxonomies );
+        $taxonomies = "'" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
 
         /**

branches/4.7/tests/phpunit/tests/term/wpGetObjectTerms.php

@@ -86 +86 @@
         }
 
+        /**
+         * @ticket 40154
+         */
+        public function test_taxonomies_passed_to_wp_get_object_terms_filter_should_be_quoted() {
+                register_taxonomy( 'wptests_tax', 'post' );
+                register_taxonomy( 'wptests_tax_2', 'post' );
+
+                add_filter( 'wp_get_object_terms', array( $this, 'wp_get_object_terms_callback' ), 10, 3 );
+                $terms = wp_get_object_terms( 1, array( 'wptests_tax', 'wptests_tax_2' ) );
+                remove_filter( 'wp_get_object_terms', array( $this, 'wp_get_object_terms_callback' ), 10, 3 );
+
+                $this->assertSame( "'wptests_tax', 'wptests_tax_2'", $this->taxonomies );
+        }
+
+        public function wp_get_object_terms_callback( $terms, $object_ids, $taxonomies ) {
+                $this->taxonomies = $taxonomies;
+                return $terms;
+        }
+
         public function test_orderby_name() {
                 $p = self::factory()->post->create();