diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-08-06 09:35:24 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-08-06 09:35:24 +0000 |
| commit | d407afd2cf84fa1d87be4dd387cdb6539aac3112 (patch) | |
| tree | 3b87936604a68a81cfcca74af607c5108d535142 /wp-admin/options.php | |
| parent | f7904d143986a96e6f209b51b380ad1ee640cad5 (diff) | |
| download | wordpress-mu-d407afd2cf84fa1d87be4dd387cdb6539aac3112.tar.gz wordpress-mu-d407afd2cf84fa1d87be4dd387cdb6539aac3112.tar.xz wordpress-mu-d407afd2cf84fa1d87be4dd387cdb6539aac3112.zip | |
Sync for WP 2.2.2
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1013 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/options.php')
| -rw-r--r-- | wp-admin/options.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/wp-admin/options.php b/wp-admin/options.php index db3c88e..466c8be 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -146,10 +146,11 @@ $options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name foreach ( (array) $options as $option) : $disabled = ''; + $option->option_name = attribute_escape($option->option_name); if ( is_serialized($option->option_value) ) { if ( is_serialized_string($option->option_value) ) { // this is a serialized string, so we should display it - $value = wp_specialchars(maybe_unserialize($option->option_value), 'single'); + $value = maybe_unserialize($option->option_value); $options_to_update[] = $option->option_name; $class = 'all-options'; } else { @@ -158,7 +159,7 @@ foreach ( (array) $options as $option) : $class = 'all-options disabled'; } } else { - $value = wp_specialchars($option->option_value, 'single'); + $value = $option->option_value; $options_to_update[] = $option->option_name; $class = 'all-options'; } @@ -167,8 +168,8 @@ foreach ( (array) $options as $option) : <th scope='row'><label for='$option->option_name'>$option->option_name</label></th> <td>"; - if (strpos($value, "\n") !== false) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>"; - else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "'$disabled />"; + if (strpos($value, "\n") !== false) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>" . wp_specialchars($value) . "</textarea>"; + else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . attribute_escape($value) . "'$disabled />"; echo "</td> <td>$option->option_description</td> @@ -177,7 +178,7 @@ endforeach; ?> </table> <?php $options_to_update = implode(',', $options_to_update); ?> -<p class="submit"><input type="hidden" name="page_options" value="<?php echo attribute_escape($options_to_update); ?>" /><input type="submit" name="Update" value="<?php _e('Update Options »') ?>" /></p> +<p class="submit"><input type="hidden" name="page_options" value="<?php echo $options_to_update; ?>" /><input type="submit" name="Update" value="<?php _e('Update Options »') ?>" /></p> </form> </div> |