From 0b85f2f7b44e705198ddfaa2ba3b85b692da4cc6 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Wed, 18 Mar 2015 18:23:26 +0000
Subject: [PATCH] Ensure that the `$exclusions` parameter of
 'list_terms_exclusions' filter is always a string.

Props fhwebcs.
Fixes #31681.
Built from https://develop.svn.wordpress.org/trunk@31813


git-svn-id: http://core.svn.wordpress.org/trunk@31795 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/taxonomy.php | 2 ++
 wp-includes/version.php  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 92ec413728..30f814fd00 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -1824,6 +1824,8 @@ function get_terms( $taxonomies, $args = '' ) {
 
 	if ( ! empty( $exclusions ) ) {
 		$exclusions = ' AND t.term_id NOT IN (' . implode( ',', array_map( 'intval', $exclusions ) ) . ')';
+	} else {
+		$exclusions = '';
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 58e64f7aef..b8305103b9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta1-31812';
+$wp_version = '4.2-beta1-31813';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.