[wp-cvs] wordpress/wp-admin options-discussion.php, 1.21, 1.22 upgrade-schema.php, 1.8, 1.9

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2486/wp-admin

Modified Files:
	options-discussion.php upgrade-schema.php 
Log Message:
Kitten's emergent registration / comment whitelisting patch.

Index: upgrade-schema.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** upgrade-schema.php	4 Oct 2004 08:19:12 -0000	1.8
--- upgrade-schema.php	4 Oct 2004 08:49:45 -0000	1.9
***************
*** 212,215 ****
--- 212,216 ----
  	add_option('template', 'default');
  	add_option('stylesheet', 'default');
+ 	add_option('comment_whitelist', 0);
  
  	// Delete unused options

Index: options-discussion.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-discussion.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** options-discussion.php	8 Sep 2004 08:17:53 -0000	1.21
--- options-discussion.php	4 Oct 2004 08:49:45 -0000	1.22
***************
*** 58,62 ****
  	<form name="form1" method="post" action="options.php"> 
  		<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_max_links','moderation_keys'" /> 
  <fieldset class="options">
          <legend><?php _e('Usual settings for an article: <em>(These settings may be overridden for individual articles.)</em>') ?></legend> 
--- 58,62 ----
  	<form name="form1" method="post" action="options.php"> 
  		<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'" /> 
  <fieldset class="options">
          <legend><?php _e('Usual settings for an article: <em>(These settings may be overridden for individual articles.)</em>') ?></legend> 
***************
*** 102,110 ****
  				<?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </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_settings('require_name_email')); ?> /> 
! 				<?php _e('User must fill out name and e-mail') ?> </label> 
! 			</li> 
  		</ul> 
  </fieldset>
--- 102,107 ----
  				<?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </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_settings('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_settings('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> 
  		</ul> 
  </fieldset>