Changeset 37141

Timestamp:

03/30/2016 05:40:10 PM (4 years ago)

Author:

nbachiyski

Message:

Taxonomies: make sure taxonomy functions work correctly with taxonomy names with special characters

The codex says that taxonomy names "should only contain lowercase letters and the underscore character", but that's not enforced. It's too late to enforce it, since some plugins haven't been following it and the official phpdoc doesn't mention this restriction.

Merge of [37133] to the 3.8 branch.

File:

• branches/3.8/src/wp-includes/taxonomy.php (modified) (3 diffs)

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

@@ -590 +590 @@
     $term_ids = array_map('intval', $term_ids );
 
-    $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
+    $taxonomies = "'" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
     $term_ids = "'" . implode( "', '", $term_ids ) . "'";
 
@@ -1349 +1349 @@
         $order = 'ASC';
 
-    $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
+    $where = "tt.taxonomy IN ('" . implode("', '", array_map( 'esc_sql', $taxonomies ) ) . "')";
     $inclusions = '';
     if ( ! empty( $include ) ) {
@@ -2028 +2028 @@
         $order = 'ASC';
 
-    $taxonomies = "'" . implode("', '", $taxonomies) . "'";
+    $taxonomies = "'" . implode("', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
     $object_ids = implode(', ', $object_ids);