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

Timestamp:

11/25/2008 06:33:04 PM (16 years ago)

Author:

ryan

Message:

Add option defaults. Add arg to get_user_option() to avoid querying options table if user option is missing. see #8229

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.
  * @return mixed
  */
-function get_user_option( $option, $user = 0 ) {
+function get_user_option( $option, $user = 0, $check_global = true ) {
     global $wpdb;
 
@@ -184 +185 @@
     elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
         $result = $user->{$option};
-    else // Blog global
+    elseif ( $check_global ) // Blog global
         $result = get_option( $option );
+    else
+        $result = false;
 
     return apply_filters("get_user_option_{$option}", $result, $option, $user);