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

Timestamp:

01/07/2010 12:01:52 AM (14 years ago)

Author:

ryan

Message:

Deprecate argument. Never fallback to options table for user option requests. Props nacin. fixes #11615

File:

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

trunk/wp-includes/user.php

@@ -215 +215 @@
  * @param string $option User option name.
  * @param int $user Optional. User ID.
- * @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.
+ * @param bool $deprecated Use get_option() to check for an option in the options table.
  * @return mixed
  */
-function get_user_option( $option, $user = 0, $check_blog_options = true ) {
-    global $wpdb;
+function get_user_option( $option, $user = 0, $deprecated = '' ) {
+    global $wpdb;
+
+    if ( !empty( $deprecated ) )
+        _deprecated_argument( __FUNCTION__, '3.0' );
 
     $option = preg_replace('|[^a-z0-9_]|i', '', $option);
@@ -231 +234 @@
     elseif ( isset( $user->{$option} ) ) // User specific and cross-blog
         $result = $user->{$option};
-    elseif ( $check_blog_options ) // Blog global
-        $result = get_option( $option );
     else
         $result = false;