golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update get_user_option()'s PHPDoc Comment to remove mentions of blog options. See #11615 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13220 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-19 10:49:07 +00:00
parent 0cf65f18a6
commit f0fc5c2dd4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/user.php
View File

@ -206,16 +206,14 @@ function user_pass_ok($user_login, $user_pass) {
// //
/** /**
* Retrieve user option that can be either global, user, or blog. * Retrieve user option that can be either per Site or per Network.
* *
* If the user ID is not given, then the current user will be used instead. If * If the user ID is not given, then the current user will be used instead. If
* the user ID is given, then the user data will be retrieved. The filter for * the user ID is given, then the user data will be retrieved. The filter for
* the result, will also pass the original option name and finally the user data * the result, will also pass the original option name and finally the user data
* object as the third parameter. * object as the third parameter.
* *
* The option will first check for the non-global name, then the global name, * The option will first check for the per site name and then the per Network name.
* and if it still doesn't find it, it will try the blog option. The option can
* either be modified or set by a plugin.
* *
* @since 2.0.0 * @since 2.0.0
* @uses $wpdb WordPress database object for queries. * @uses $wpdb WordPress database object for queries.
@ -764,4 +762,4 @@ function clean_user_cache($id) {
wp_cache_delete($user->user_nicename, 'userslugs'); wp_cache_delete($user->user_nicename, 'userslugs');
} }
?> ?>