Changeset 10095 for trunk/wp-includes/user.php

Timestamp:

12/07/2008 03:53:28 AM (16 years ago)

Author:

ryan

Message:

Make wp_user_settings() options global again. Clarify flag on get_user_option().

File:

• trunk/wp-includes/user.php (modified) (2 diffs)

trunk/wp-includes/user.php

@@ -169 +169 @@
  * @param string $option User option name.
  * @param int $user Optional. User ID.
- * @param bool $check_global Whether to check for a global option if a per-user option does not exist. Default is true.
+ * @param bool $check_blog_options Whether to check for an option in the options table if a per-user option does not exist. Default is true.
  * @return mixed
  */
-function get_user_option( $option, $user = 0, $check_global = true ) {
+function get_user_option( $option, $user = 0, $check_blog_options = true ) {
     global $wpdb;
 
@@ -185 +185 @@
     elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
         $result = $user->{$option};
-    elseif ( $check_global ) // Blog global
+    elseif ( $check_blog_options ) // Blog global
         $result = get_option( $option );
     else