From bfa3b629e0d67016ec83050c5db762479af40609 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Wed, 13 Aug 2008 15:13:05 +0000
Subject: Merge with WP revision 8635

git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1421 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/includes/template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wp-admin/includes/template.php')

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 3a1abfd..3d6aac5 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -670,7 +670,7 @@ function user_row( $user_object, $style = '', $role = '' ) {
 	} else {
 		$edit = $user_object->user_login;
 	}
-	$role_name = translate_with_context($wp_roles->role_names[$role]);
+	$role_name = $wp_roles->role_names[$role] ? translate_with_context($wp_roles->role_names[$role]) : __('None');
 	$r = "<tr id='user-$user_object->ID'$style>
 		<th scope='row' class='check-column'><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></th>
 		<td><strong>$edit</strong></td>
-- 
cgit