Changeset 41668

Timestamp:

10/02/2017 03:37:29 AM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Deprecate is_user_option_local().

is_user_option_local() was added during MU development and used for a handful of changesets before the code using it was removed again. It has not been used by MU or core since nor is it widely used elsewhere.

Fixes #41697.
Props bnap00, jeremyfelt.

Location:

trunk/src/wp-includes

Files:

• ms-deprecated.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)

trunk/src/wp-includes/ms-deprecated.php

@@ -520 +520 @@
     return $results;
 }
+
+/**
+ * Check whether a usermeta key has to do with the current blog.
+ *
+ * @since MU (3.0.0)
+ * @deprecated 4.9.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param string $key
+ * @param int    $user_id Optional. Defaults to current user.
+ * @param int    $blog_id Optional. Defaults to current blog.
+ * @return bool
+ */
+function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
+    global $wpdb;
+
+    _deprecated_function( __FUNCTION__, '4.9.0' );
+
+    $current_user = wp_get_current_user();
+    if ( $blog_id == 0 ) {
+        $blog_id = get_current_blog_id();
+    }
+    $local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
+
+    return isset( $current_user->$local_key );
+}

trunk/src/wp-includes/ms-functions.php

@@ -2202 +2202 @@
 
 /**
- * Check whether a usermeta key has to do with the current blog.
- *
- * @since MU (3.0.0)
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string $key
- * @param int    $user_id Optional. Defaults to current user.
- * @param int    $blog_id Optional. Defaults to current blog.
- * @return bool
- */
-function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
-    global $wpdb;
-
-    $current_user = wp_get_current_user();
-    if ( $blog_id == 0 ) {
-        $blog_id = get_current_blog_id();
-    }
-    $local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
-
-    return isset( $current_user->$local_key );
-}
-
-/**
  * Check whether users can self-register, based on Network settings.
  *