Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Some fixes from Joeseph Scott. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@1379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-06-01 10:01:15 +00:00
parent 95a6e3d171
commit 53dade6946
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/categories.php
View File

@ -183,7 +183,7 @@ set them back to the default category <strong>%s</strong>.'), get_catname(1)) ?>
<p><?php _e('Category parent:') ?><br />
<select name='cat' class='postform'>
<option value='0'><?php _e('None') ?></option>
<?php wp_dropdown_cats(); ?></p>
<?php wp_dropdown_cats(0); ?></p>
</select>
<p><?php _e('Description: (optional)') ?> <br />
<textarea name="category_description" rows="5" cols="50" style="width: 97%;"></textarea></p>

8
wp-admin/options.php
View File

@ -38,7 +38,7 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
if (isset($_GET['option_group_id'])) $option_group_id = (int) $_GET['option_group_id'];
require_once('./optionhandler.php');
$non_was_selected = 0;
if ('' == $_GET['option_group_id']) {
if (!isset($_GET['option_group_id'])) {
$option_group_id = 1;
$non_was_selected = 1;
}
@ -74,7 +74,7 @@ $nonbools = array('default_ping_status', 'default_comment_status');
// should we even bother checking?
if ($user_level >= $option->option_admin_level) {
$old_val = stripslashes($option->option_value);
$new_val = $_POST[$option->option_name];
if(isset($_POST[$option->option_name])) $new_val = $_POST[$option->option_name];
if (!$new_val) {
if (3 == $option->option_type)
$new_val = '';
@ -87,7 +87,7 @@ $nonbools = array('default_ping_status', 'default_comment_status');
$result = $wpdb->query($query);
//if( in_array($option->option_name, $nonbools)) die('boo'.$query);
if (!$result) {
$db_errors .= sprintf(__(" SQL error while saving %s. "), $this_name);
$dB_errors .= sprintf(__(" SQL error while saving %s. "), $this_name);
} else {
++$any_changed;
}
@ -102,7 +102,7 @@ $nonbools = array('default_ping_status', 'default_comment_status');
$message = sprintf(__('%d setting(s) saved... '), $any_changed);
}
if (($dB_errors != '') || ($validation_message != '')) {
if ( isset($dB_errors) || isset($validation_message) ) {
if ($message != '') {
$message .= '<br />';
}