From d0aa8e4a6e40af0572a6df36c8cccfbd869396cc Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 12 Jun 2015 18:55:25 +0000
Subject: [PATCH] In `WP_Terms_List_Table::display_rows_or_placeholder()`: *
 `get_terms()` can return `WP_Error`, so its return value should be checked
 before traversing. * The 2nd call to `get_terms()` can be removed, it is
 redundant #OPTIMIZATION

See #32444.

Built from https://develop.svn.wordpress.org/trunk@32739


git-svn-id: http://core.svn.wordpress.org/trunk@32710 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-terms-list-table.php | 3 +--
 wp-includes/version.php                         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

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 '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
 			$this->no_items();
 			echo '</td></tr>';
@@ -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.