Merge from WP Core, things are broken right now.

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

1 files changed, 5 insertions, 6 deletions

diff --git a/wp-inst/wp-admin/upgrade-functions.php b/wp-inst/wp-admin/upgrade-functions.php
index e6ee8c8..3c60393 100644
--- a/wp-inst/wp-admin/upgrade-functions.php
+++ b/wp-inst/wp-admin/upgrade-functions.php
@@ -759,20 +759,19 @@ function translate_level_to_role($level) {
 	case 10:
 	case 9:
 	case 8:
-		return 'publisher';
+		return 'administrator';
 	case 7:
 	case 6:
 	case 5:
-		return 'managing_editor';
+		return 'editor';
 	case 4:
 	case 3:
-		return 'copy_editor';
 	case 2:
-		return 'staff_writer';
+		return 'author';
 	case 1:
-		return 'freelancer';
+		return 'contributor';
 	case 0:
-		return 'visitor';
+		return 'subscriber';
 	}
 }