[wp-cvs] wordpress/wp-admin categories.php, 1.30, 1.31 options.php, 1.21, 1.22

[Matthew Mullenweg]

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

Modified Files:
	categories.php options.php 
Log Message:
Some fixes from Joeseph Scott.

Index: categories.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/categories.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** categories.php	24 May 2004 08:22:16 -0000	1.30
--- categories.php	1 Jun 2004 10:01:13 -0000	1.31
***************
*** 184,188 ****
          <select name='cat' class='postform'>
          <option value='0'><?php _e('None') ?></option>
!         <?php wp_dropdown_cats(); ?></p>
          </select>
          <p><?php _e('Description: (optional)') ?> <br />
--- 184,188 ----
          <select name='cat' class='postform'>
          <option value='0'><?php _e('None') ?></option>
!         <?php wp_dropdown_cats(0); ?></p>
          </select>
          <p><?php _e('Description: (optional)') ?> <br />

Index: options.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** options.php	24 May 2004 08:22:17 -0000	1.21
--- options.php	1 Jun 2004 10:01:15 -0000	1.22
***************
*** 39,43 ****
  require_once('./optionhandler.php');
  $non_was_selected = 0;
! if ('' == $_GET['option_group_id']) {
      $option_group_id = 1;
      $non_was_selected = 1;
--- 39,43 ----
  require_once('./optionhandler.php');
  $non_was_selected = 0;
! if (!isset($_GET['option_group_id'])) {
      $option_group_id = 1;
      $non_was_selected = 1;
***************
*** 75,79 ****
              if ($user_level >= $option->option_admin_level) {
                  $old_val = stripslashes($option->option_value);
!                 $new_val = $_POST[$option->option_name];
  				if (!$new_val) {
  					if (3 == $option->option_type)
--- 75,79 ----
              if ($user_level >= $option->option_admin_level) {
                  $old_val = stripslashes($option->option_value);
!                 if(isset($_POST[$option->option_name])) $new_val = $_POST[$option->option_name];
  				if (!$new_val) {
  					if (3 == $option->option_type)
***************
*** 88,92 ****
  					//if( in_array($option->option_name, $nonbools)) die('boo'.$query);
  					if (!$result) {
! 						$db_errors .= sprintf(__(" SQL error while saving %s. "), $this_name);
  					} else {
  						++$any_changed;
--- 88,92 ----
  					//if( in_array($option->option_name, $nonbools)) die('boo'.$query);
  					if (!$result) {
! 						$dB_errors .= sprintf(__(" SQL error while saving %s. "), $this_name);
  					} else {
  						++$any_changed;
***************
*** 103,107 ****
      }
      
!     if (($dB_errors != '') || ($validation_message != '')) {
          if ($message != '') {
              $message .= '<br />';
--- 103,107 ----
      }
      
!     if ( isset($dB_errors)  || isset($validation_message) ) {
          if ($message != '') {
              $message .= '<br />';