Changeset 14090

Timestamp:

04/14/2010 10:06:03 PM (13 years ago)

Author:

nacin

Message:

Deprecate set_current_user() in favor of wp_set_current_user().

Location:

trunk

Files:

• wp-includes/pluggable-deprecated.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)
• xmlrpc.php (modified) (1 diff)

trunk/wp-includes/pluggable-deprecated.php

@@ -15 +15 @@
  * Deprecated functions come here to die.
  */
+
+if ( !function_exists('set_current_user') ) :
+/**
+ * Changes the current user by ID or name.
+ *
+ * Set $id to null and specify a name if you do not know a user's ID.
+ *
+ * @since 2.0.1
+ * @see wp_set_current_user() An alias of wp_set_current_user()
+ * @deprecated 3.0.0
+ * @deprecated Use wp_set_current_user()
+ *
+ * @param int|null $id User ID.
+ * @param string $name Optional. The user's username
+ * @return object returns wp_set_current_user()
+ */
+function set_current_user($id, $name = '') {
+    _deprecated_function( __FUNCTION__, '3.0', 'wp_set_current_user()' );
+    return wp_set_current_user($id, $name);
+}
+endif;
 
 if ( !function_exists('wp_setcookie') ) :

trunk/wp-includes/pluggable.php

@@ -6 +6 @@
  * @package WordPress
  */
-
-if ( !function_exists('set_current_user') ) :
-/**
- * Changes the current user by ID or name.
- *
- * Set $id to null and specify a name if you do not know a user's ID.
- *
- * @since 2.0.1
- * @see wp_set_current_user() An alias of wp_set_current_user()
- *
- * @param int|null $id User ID.
- * @param string $name Optional. The user's username
- * @return object returns wp_set_current_user()
- */
-function set_current_user($id, $name = '') {
-    return wp_set_current_user($id, $name);
-}
-endif;
 
 if ( !function_exists('wp_set_current_user') ) :

trunk/wp-includes/user.php

@@ -479 +479 @@
  * Set up global user vars.
  *
- * Used by set_current_user() for back compat. Might be deprecated in the
- * future.
+ * Used by wp_set_current_user() for back compat. Might be deprecated in the future.
  *
  * @since 2.0.4

trunk/xmlrpc.php

@@ -280 +280 @@
         }
 
-        set_current_user( $user->ID );
+        wp_set_current_user( $user->ID );
         return $user;
     }