From b6f368702d687e92dadf4a741e02325e9da62b0c Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 18 Jan 2006 03:07:26 +0000
Subject: [PATCH] wp_roles cleanup

git-svn-id: http://svn.automattic.com/wordpress/trunk@3453 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/upgrade-schema.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index f1e579cae3..e89b893db0 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -251,14 +251,14 @@ function populate_roles_160() {
 	global $wp_roles;
 
 	// Add roles
-	$wp_roles->add_role('administrator', __('Administrator'));
-	$wp_roles->add_role('editor', __('Editor'));
-	$wp_roles->add_role('author', __('Author'));
-	$wp_roles->add_role('contributor', __('Contributor'));
-	$wp_roles->add_role('subscriber', __('Subscriber'));
+	add_role('administrator', __('Administrator'));
+	add_role('editor', __('Editor'));
+	add_role('author', __('Author'));
+	add_role('contributor', __('Contributor'));
+	add_role('subscriber', __('Subscriber'));
 	
 	// Add caps for Administrator role
-	$role = $wp_roles->get_role('administrator');
+	$role = get_role('administrator');
 	$role->add_cap('switch_themes');
 	$role->add_cap('edit_themes');
 	$role->add_cap('activate_plugins');
@@ -291,7 +291,7 @@ function populate_roles_160() {
 	$role->add_cap('level_0');
 	
 	// Add caps for Editor role
-	$role = $wp_roles->get_role('editor');
+	$role = get_role('editor');
 	$role->add_cap('moderate_comments');
 	$role->add_cap('manage_categories');
 	$role->add_cap('manage_links');
@@ -313,7 +313,7 @@ function populate_roles_160() {
 	$role->add_cap('level_0');
 	
 	// Add caps for Author role
-	$role = $wp_roles->get_role('author');
+	$role = get_role('author');
 	$role->add_cap('upload_files');
 	$role->add_cap('edit_posts');
 	$role->add_cap('edit_published_posts');
@@ -324,14 +324,14 @@ function populate_roles_160() {
 	$role->add_cap('level_0');
 	
 	// Add caps for Contributor role
-	$role = $wp_roles->get_role('contributor');
+	$role = get_role('contributor');
 	$role->add_cap('edit_posts');
 	$role->add_cap('read');
 	$role->add_cap('level_1');
 	$role->add_cap('level_0');
 	
 	// Add caps for Subscriber role
-	$role = $wp_roles->get_role('subscriber');
+	$role = get_role('subscriber');
 	$role->add_cap('read');
 	$role->add_cap('level_0');
 }