From 268d79cb77e706ebee536aa14e91022fd7a73b88 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 13 Feb 2015 04:22:26 +0000
Subject: [PATCH] `_list_meta_row()` should always return a string.

props ipm-frommen.
fixes #31310.
Built from https://develop.svn.wordpress.org/trunk@31442


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

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 3973d80ca0..30e333ec5e 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -582,7 +582,7 @@ function _list_meta_row( $entry, &$count ) {
 	static $update_nonce = false;
 
 	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
-		return;
+		return '';
 
 	if ( !$update_nonce )
 		$update_nonce = wp_create_nonce( 'add-meta' );
@@ -597,7 +597,7 @@ function _list_meta_row( $entry, &$count ) {
 		} else {
 			// This is a serialized array/object so we should NOT display it.
 			--$count;
-			return;
+			return '';
 		}
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index aa582a5e44..77e4521f71 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31441';
+$wp_version = '4.2-alpha-31442';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.