WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@451 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 7 insertions, 0 deletions

diff --git a/wp-inst/wp-includes/capabilities.php b/wp-inst/wp-includes/capabilities.php
index 07d48d6..42db7ab 100644
--- a/wp-inst/wp-includes/capabilities.php
+++ b/wp-inst/wp-includes/capabilities.php
@@ -279,6 +279,13 @@ function current_user_can($capability) {
 	return call_user_func_array(array(&$current_user, 'has_cap'), $args);
 }
 
+// Convenience wrapper around $wp_roles.
+function get_role($role) {
+	global $wp_roles;
+
+	return $wp_roles->get_role($role);
+}
+
 //
 // These are deprecated.  Use current_user_can().
 //