summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-admin/options.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-07-18 09:16:34 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-07-18 09:16:34 +0000
commit3d22aa49e07b92dab07b1f9d6a8a66fb6ab20bdc (patch)
tree1bc483947163c7351f73b2c62a69ef774e021775 /wp-inst/wp-admin/options.php
parent9d3f6c7b7452785bd585424238dd29f9d7369480 (diff)
downloadwordpress-mu-3d22aa49e07b92dab07b1f9d6a8a66fb6ab20bdc.tar.gz
wordpress-mu-3d22aa49e07b92dab07b1f9d6a8a66fb6ab20bdc.tar.xz
wordpress-mu-3d22aa49e07b92dab07b1f9d6a8a66fb6ab20bdc.zip
Merge from WP Core.
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@31 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/options.php')
-rw-r--r--wp-inst/wp-admin/options.php21
1 files changed, 9 insertions, 12 deletions
diff --git a/wp-inst/wp-admin/options.php b/wp-inst/wp-admin/options.php
index c6158d3..609c0b2 100644
--- a/wp-inst/wp-admin/options.php
+++ b/wp-inst/wp-admin/options.php
@@ -21,7 +21,7 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
}
}
-if ($user_level < 6)
+if ( !current_user_can('manage_options') )
die ( __('Cheatin&#8217; uh?') );
switch($action) {
@@ -50,17 +50,14 @@ case 'update':
if ($options) {
$options = apply_filters( 'options_to_update' , $options );
foreach ($options as $option) {
- // should we even bother checking?
- if ($user_level >= $option->option_admin_level) {
- $old_val = $option->option_value;
- $new_val = trim($_POST[$option->option_name]);
- if( in_array($option->option_name, $nonbools) && ( $new_val == '0' || $new_val == '') )
- $new_val = 'closed';
- if ($new_val !== $old_val) {
- $result = $wpdb->query("UPDATE $wpdb->options SET option_value = '$new_val' WHERE option_name = '$option->option_name'");
- $any_changed++;
- }
- }
+ $old_val = $option->option_value;
+ $new_val = trim($_POST[$option->option_name]);
+ if( in_array($option->option_name, $nonbools) && ( $new_val == '0' || $new_val == '') )
+ $new_val = 'closed';
+ if ($new_val !== $old_val) {
+ $result = $wpdb->query("UPDATE $wpdb->options SET option_value = '$new_val' WHERE option_name = '$option->option_name'");
+ $any_changed++;
+ }
}
unset($cache_settings); // so they will be re-read
get_settings('siteurl'); // make it happen now