Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 22:35:02 +02:00
Code Issues Projects Releases Wiki Activity

delete_user_setting() and remove_action() were getting called with too many args. props rlerdorf. see #24210.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@24125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-04-29 13:25:15 +00:00
parent 0d8d513a8d
commit 17ddaa8de0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/user.php
View File

@ -347,7 +347,7 @@ function default_password_nag_edit_user($user_ID, $old_data) {
$new_data = get_userdata($user_ID);
if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
delete_user_setting('default_password_nag', $user_ID);
delete_user_setting('default_password_nag');
update_user_option($user_ID, 'default_password_nag', false, true);
}
}

2
wp-includes/rewrite.php
View File

@ -89,7 +89,7 @@ function add_feed($feedname, $function) {
$wp_rewrite->feeds[] = $feedname;
$hook = 'do_feed_' . $feedname;
// Remove default function hook
remove_action($hook, $hook, 10, 1);
remove_action($hook, $hook);
add_action($hook, $function, 10, 1);
return $hook;
}