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, 12 insertions, 1 deletions

diff --git a/wp-inst/wp-admin/options-general.php b/wp-inst/wp-admin/options-general.php
index 2a09684..95d5aa1 100644
--- a/wp-inst/wp-admin/options-general.php
+++ b/wp-inst/wp-admin/options-general.php
@@ -11,7 +11,7 @@ include('admin-header.php');
   <h2><?php _e('General Options') ?></h2> 
   <form name="form1" method="post" action="options.php"> 
     <input type="hidden" name="action" value="update" /> 
-	<input type="hidden" name="action" value="update" /> <input type="hidden" name="page_options" value="'blogname','blogdescription','admin_email','users_can_register','gmt_offset','date_format','time_format','start_of_week','comment_registration'" /> 
+	<input type="hidden" name="action" value="update" /> <input type="hidden" name="page_options" value="'blogname','blogdescription','admin_email','users_can_register','gmt_offset','date_format','time_format','start_of_week','comment_registration','default_role'" /> 
     <table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
       <tr valign="top"> 
         <th width="33%" scope="row"><?php _e('Weblog title:') ?></th> 
@@ -40,6 +40,17 @@ include('admin-header.php');
 			</label>
 </td> 
       </tr> 
+      <tr valign="top"> 
+        <th scope="row"><?php _e('New User Default Role:') ?></th> 
+        <td><label for="default_role"> 
+          <select name="default_role" id="default_role"><?php 
+					foreach($wp_roles->role_names as $role => $name) {
+						$selected = (get_settings('default_role') == $role) ? 'selected="selected"' : '';
+						echo "<option {$selected} value=\"{$role}\">{$name}</option>";
+					}
+					?></select></label>
+				</td> 
+      </tr> 
     </table> 
     <fieldset class="options"> 
     <legend><?php _e('Date and Time') ?></legend>