diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php
index f903cb5aaf..c061fa6412 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -223,7 +223,7 @@ class WP_Terms_List_Table extends WP_List_Table {
}
$terms = get_terms( $taxonomy, $args );
- if ( empty( $terms ) ) {
+ if ( empty( $terms ) || ! is_array( $terms ) ) {
echo '
| ';
$this->no_items();
echo ' |
';
@@ -239,7 +239,6 @@ class WP_Terms_List_Table extends WP_List_Table {
// Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
$this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
} else {
- $terms = get_terms( $taxonomy, $args );
foreach ( $terms as $term ) {
$this->single_row( $term );
}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ce51590397..befff69a2b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.3-alpha-32738';
+$wp_version = '4.3-alpha-32739';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.