Index: wp-comments-post.php
===================================================================
--- wp-comments-post.php	(revision 5652)
+++ wp-comments-post.php	(working copy)
@@ -48,11 +48,20 @@
 
 $comment_type = '';
 
-if ( get_option('require_name_email') && !$user->ID ) {
-	if ( 6 > strlen($comment_author_email) || '' == $comment_author )
-		wp_die( __('Error: please fill the required fields (name, email).') );
-	elseif ( !is_email($comment_author_email))
-		wp_die( __('Error: please enter a valid email address.') );
+if ( !$user->ID ) {
+	if ( get_option( 'require_commenter_name' ) && $comment_author == '' ) {
+		wp_die( __( 'Error: please complete the name field.' ) );
+	}
+	
+	if ( get_option( 'require_commenter_email' ) && strlen( $comment_author_email ) < 6 ) {
+		wp_die( __( 'Error: please complete the email field.' ) );
+	} elseif ( !is_email( $comment_author_email ) ) {
+		wp_die( __( 'Error: please enter a valid email address.' ) );
+	}
+	
+	if ( get_option( 'require_commenter_url' ) && ( $comment_author_url == '' || $comment_author_url == 'http://' ) ) {
+		wp_die( __( 'Error: please complete the URL field.' );
+	}
 }
 
 if ( '' == $comment_content )
Index: wp-includes/version.php
===================================================================
--- wp-includes/version.php	(revision 5652)
+++ wp-includes/version.php	(working copy)
@@ -3,6 +3,6 @@
 // This holds the version number in a separate file so we can bump it without cluttering the SVN
 
 $wp_version = '2.3-alpha';
-$wp_db_version = 5539;
+$wp_db_version = 5542;
 
 ?>
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 5652)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -188,7 +188,7 @@
 	if ( $wp_current_db_version < 4351 )
 		upgrade_old_slugs();
 	
-	if ( $wp_current_db_version < 5539 )
+	if ( $wp_current_db_version < 5542 )
 		upgrade_230();
 
 	
@@ -662,6 +662,13 @@
 
 		$wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id) VALUES ('$link_id', '$tt_id')");
 	}
+	
+	if ( get_option( 'require_name_email' ) == '1' ) {
+		add_option( 'require_commenter_name', true );
+		add_option( 'require_commenter_email', true );
+		
+		delete_option( 'require_name_email' );
+	}
 }
 
 function upgrade_old_slugs() {
Index: wp-admin/options-discussion.php
===================================================================
--- wp-admin/options-discussion.php	(revision 5652)
+++ wp-admin/options-discussion.php	(working copy)
@@ -6,81 +6,82 @@
 
 include('admin-header.php');
 ?>
-
 <div class="wrap"> 
-<h2><?php _e('Discussion Options') ?></h2> 
-<form method="post" action="options.php"> 
-<?php wp_nonce_field('update-options') ?>
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
-<fieldset class="options">
-<legend><?php echo __('Usual settings for an article:').'<br /><small><em>('.__('These settings may be overridden for individual articles.').')</em></small>'; ?></legend> 
-<ul> 
-<li> 
-<label for="default_pingback_flag"> 
-<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> 
-<?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label> 
-</li> 
-<li> 
-<label for="default_ping_status"> 
-<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> 
-<?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label> 
-</li> 
-<li> 
-<label for="default_comment_status"> 
-<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> /> 
-<?php _e('Allow people to post comments on the article') ?></label> 
-</li> 
-</ul> 
-</fieldset>
-<fieldset class="options">
-<legend><?php _e('E-mail me whenever:') ?></legend> 
-<ul> 
-<li> 
-<label for="comments_notify"> 
-<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> /> 
-<?php _e('Anyone posts a comment') ?> </label> 
-</li> 
-<li> 
-<label for="moderation_notify"> 
-<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> /> 
-<?php _e('A comment is held for moderation') ?> </label> 
-</li> 
-</ul> 
-</fieldset>
-<fieldset class="options">
-<legend><?php _e('Before a comment appears:') ?></legend> 
-<ul>
-<li>
-<label for="comment_moderation"> 
-<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> /> 
-<?php _e('An administrator must always approve the comment') ?> </label> 
-</li> 
-<li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li> 
-<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> 
-</ul> 
-</fieldset>
-<fieldset class="options">
-<legend><?php _e('Comment Moderation') ?></legend>
-<p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
+	<h2><?php _e('Discussion Options') ?></h2> 
+	<form method="post" action="options.php"> 
+		<?php wp_nonce_field('update-options') ?>
+		<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
+		<fieldset class="options">
+			<legend><?php echo __('Usual settings for an article:').'<br /><small><em>('.__('These settings may be overridden for individual articles.').')</em></small>'; ?></legend> 
+			<ul> 
+				<li> 
+					<label for="default_pingback_flag"> 
+						<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> 
+					<?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label> 
+				</li> 
+				<li> 
+					<label for="default_ping_status"> 
+						<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> 
+					<?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label> 
+				</li> 
+				<li> 
+					<label for="default_comment_status"> 
+						<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> /> 
+					<?php _e('Allow people to post comments on the article') ?></label> 
+				</li> 
+			</ul> 
+		</fieldset>
+		<fieldset class="options">
+			<legend><?php _e('E-mail me whenever:') ?></legend> 
+			<ul> 
+				<li> 
+					<label for="comments_notify"> 
+						<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> /> 
+					<?php _e('Anyone posts a comment') ?> </label> 
+				</li> 
+				<li> 
+					<label for="moderation_notify"> 
+						<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> /> 
+					<?php _e('A comment is held for moderation') ?> </label> 
+				</li> 
+			</ul> 
+		</fieldset>
+		<fieldset class="options">
+			<legend><?php _e('Before a comment appears:') ?></legend> 
+			<ul>
+				<li>
+					<label for="comment_moderation"> 
+						<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> /> 
+					<?php _e('An administrator must always approve the comment') ?> </label> 
+				</li>
+				<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li>
+				<li><label for="require_commenter_name"><input type="checkbox" name="require_commenter_name" id="require_commenter_name" <?php checked( true, (bool) get_option( 'require_commenter_name' ) ); ?>/> <?php _e( 'Require commenter&#8217;s name' ); ?></label></li>
+				<li><label for="require_commenter_email"><input type="checkbox" name="require_commenter_email" id="require_commenter_email" <?php checked( true, (bool) get_option( 'require_commenter_email' ) ); ?>/> <?php _e( 'Require commenter&#8217;s email' ); ?></label></li>
+				<li><label for="require_commenter_url"><input type="checkbox" name="require_commenter_url" id="require_commenter_url" <?php checked( true, (bool) get_option( 'require_commenter_url' ) ); ?>/><?php _e( 'Require commenter&#8217;s URL' ); ?></label></li>
+			</ul> 
+		</fieldset>
+		<fieldset class="options">
+			<legend><?php _e('Comment Moderation') ?></legend>
+			<p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
 
-<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
-<p> 
-<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea> 
-</p> 
-</fieldset>
-<fieldset class="options">
-<legend><?php _e('Comment Blacklist') ?></legend>
-<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
-<p> 
-<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea> 
-</p>
-</fieldset>
-<p class="submit">
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys" /> 
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
-</p>
-</form>
+			<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
+			<p> 
+				<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea> 
+			</p> 
+		</fieldset>
+		<fieldset class="options">
+			<legend><?php _e('Comment Blacklist') ?></legend>
+			<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
+			<p> 
+				<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea> 
+			</p>
+		</fieldset>
+		<p class="submit">
+			<input type="hidden" name="action" value="update" /> 
+			<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys" /> 
+			<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
+		</p>
+	</form>
 </div>
 
 <?php include('./admin-footer.php'); ?>
\ No newline at end of file