Changeset 15174

Timestamp:

06/08/2010 03:12:15 PM (13 years ago)

Author:

ryan

Message:

Update get_current_user_id() and move to user.php. Props filosofo. fixes #13785

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/ms-deprecated.php

@@ -99 +99 @@
  * @since MU
  * @deprecated 3.0.0
- * @deprecated Use $GLOBALS['current_user']->ID
- */
-function get_current_user_id() {
-    _deprecated_function( __FUNCTION__, '3.0', '$GLOBALS[\'current_user\']->ID' );
-    return $GLOBALS['current_user']->ID;
-}
-
-/**
- * @since MU
- * @deprecated 3.0.0
  * @deprecated Use get_user_by()
  * @see get_user_by()

trunk/wp-includes/user.php

@@ -210 +210 @@
 // User option functions
 //
+
+/**
+ * Get the current user's ID
+ * 
+ * @since MU
+ * 
+ * @uses wp_get_current_user
+ *
+ * @return int The current user's ID
+ */
+function get_current_user_id() {
+    $user = wp_get_current_user();
+    return ( isset( $user->ID ) ? (int) $user->ID : 0 );
+}
 
 /**