diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-11 15:20:48 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-11 15:20:48 +0000 |
| commit | 91c2d227e28206ec57d2b857822d90b11af256d3 (patch) | |
| tree | b5eb7cf33ac2251d358b16b6d62af570d69aa224 /wp-includes/functions.php | |
| parent | 93b61271ad288c6031c6b33405711e89a1575be2 (diff) | |
| download | wordpress-mu-91c2d227e28206ec57d2b857822d90b11af256d3.tar.gz wordpress-mu-91c2d227e28206ec57d2b857822d90b11af256d3.tar.xz wordpress-mu-91c2d227e28206ec57d2b857822d90b11af256d3.zip | |
WP Merge to 4182
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@736 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/functions.php')
| -rw-r--r-- | wp-includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php index de40712..230bf96 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -275,7 +275,7 @@ function update_option($option_name, $newvalue) { $option_name = $wpdb->escape($option_name); $wpdb->query("UPDATE $wpdb->options SET option_value = '$newvalue' WHERE option_name = '$option_name'"); if ( $wpdb->rows_affected == 1 ) { - do_action("update_option_{$option_name}", array('old'=>$oldvalue, 'new'=>$_newvalue)); + do_action("update_option_{$option_name}", $oldvalue, $_newvalue); return true; } return false; @@ -1107,7 +1107,7 @@ function wp_explain_nonce($action) { } } - return __('Are you sure you want to do this?'); + return apply_filters( 'explain_nonce_' . $verb . '-' . $noun, __('Are you sure you want to do this?'), $matches[4] ); } function wp_nonce_ays($action) { |