X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/61343b82c4f0da4c68e4c6373daafff4a81efdd1..refs/tags/wordpress-4.7.1:/wp-includes/pluggable-deprecated.php

diff --git a/wp-includes/pluggable-deprecated.php b/wp-includes/pluggable-deprecated.php
index 02733b2b..03eeae48 100644
--- a/wp-includes/pluggable-deprecated.php
+++ b/wp-includes/pluggable-deprecated.php
@@ -22,33 +22,49 @@ if ( !function_exists('set_current_user') ) :
  * 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()
+ * @deprecated 3.0.0 Use wp_set_current_user()
+ * @see 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()
+ * @return WP_User returns wp_set_current_user()
  */
 function set_current_user($id, $name = '') {
-	_deprecated_function( __FUNCTION__, '3.0', 'wp_set_current_user()' );
+	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_set_current_user()' );
 	return wp_set_current_user($id, $name);
 }
 endif;
 
+if ( !function_exists('get_currentuserinfo') ) :
+/**
+ * Populate global variables with information about the currently logged in user.
+ *
+ * @since 0.71
+ * @deprecated 4.5.0 Use wp_get_current_user()
+ * @see wp_get_current_user()
+ *
+ * @return bool|WP_User False on XMLRPC Request and invalid auth cookie, WP_User instance otherwise.
+ */
+function get_currentuserinfo() {
+	_deprecated_function( __FUNCTION__, '4.5.0', 'wp_get_current_user()' );
+
+	return _wp_get_current_user();
+}
+endif;
+
 if ( !function_exists('get_userdatabylogin') ) :
 /**
  * Retrieve user info by login name.
  *
  * @since 0.71
- * @deprecated 3.3.0
- * @deprecated Use get_user_by('login')
+ * @deprecated 3.3.0 Use get_user_by()
+ * @see get_user_by()
  *
  * @param string $user_login User's username
  * @return bool|object False on failure, User DB row object
  */
 function get_userdatabylogin($user_login) {
-	_deprecated_function( __FUNCTION__, '3.3', "get_user_by('login')" );
+	_deprecated_function( __FUNCTION__, '3.3.0', "get_user_by('login')" );
 	return get_user_by('login', $user_login);
 }
 endif;
@@ -57,15 +73,15 @@ if ( !function_exists('get_user_by_email') ) :
 /**
  * Retrieve user info by email.
  *
- * @since 2.5
- * @deprecated 3.3.0
- * @deprecated Use get_user_by('email')
+ * @since 2.5.0
+ * @deprecated 3.3.0 Use get_user_by()
+ * @see get_user_by()
  *
  * @param string $email User's email address
  * @return bool|object False on failure, User DB row object
  */
 function get_user_by_email($email) {
-	_deprecated_function( __FUNCTION__, '3.3', "get_user_by('email')" );
+	_deprecated_function( __FUNCTION__, '3.3.0', "get_user_by('email')" );
 	return get_user_by('email', $email);
 }
 endif;
@@ -74,9 +90,8 @@ if ( !function_exists('wp_setcookie') ) :
 /**
  * Sets a cookie for a user who just logged in. This function is deprecated.
  *
- * @since 1.5
- * @deprecated 2.5
- * @deprecated Use wp_set_auth_cookie()
+ * @since 1.5.0
+ * @deprecated 2.5.0 Use wp_set_auth_cookie()
  * @see wp_set_auth_cookie()
  *
  * @param string $username The user's username
@@ -87,29 +102,28 @@ if ( !function_exists('wp_setcookie') ) :
  * @param bool $remember Optional. Remember that the user is logged in
  */
 function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_set_auth_cookie()' );
+	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_set_auth_cookie()' );
 	$user = get_user_by('login', $username);
 	wp_set_auth_cookie($user->ID, $remember);
 }
 else :
-	_deprecated_function( 'wp_setcookie', '2.5', 'wp_set_auth_cookie()' );
+	_deprecated_function( 'wp_setcookie', '2.5.0', 'wp_set_auth_cookie()' );
 endif;
 
 if ( !function_exists('wp_clearcookie') ) :
 /**
  * Clears the authentication cookie, logging the user out. This function is deprecated.
  *
- * @since 1.5
- * @deprecated 2.5
- * @deprecated Use wp_clear_auth_cookie()
+ * @since 1.5.0
+ * @deprecated 2.5.0 Use wp_clear_auth_cookie()
  * @see wp_clear_auth_cookie()
  */
 function wp_clearcookie() {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_clear_auth_cookie()' );
+	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_clear_auth_cookie()' );
 	wp_clear_auth_cookie();
 }
 else :
-	_deprecated_function( 'wp_clearcookie', '2.5', 'wp_clear_auth_cookie()' );
+	_deprecated_function( 'wp_clearcookie', '2.5.0', 'wp_clear_auth_cookie()' );
 endif;
 
 if ( !function_exists('wp_get_cookie_login') ):
@@ -120,17 +134,16 @@ if ( !function_exists('wp_get_cookie_login') ):
  * used anywhere in WordPress. Also, plugins shouldn't use it either.
  *
  * @since 2.0.3
- * @deprecated 2.5
- * @deprecated No alternative
+ * @deprecated 2.5.0
  *
  * @return bool Always returns false
  */
 function wp_get_cookie_login() {
-	_deprecated_function( __FUNCTION__, '2.5' );
+	_deprecated_function( __FUNCTION__, '2.5.0' );
 	return false;
 }
 else :
-	_deprecated_function( 'wp_get_cookie_login', '2.5' );
+	_deprecated_function( 'wp_get_cookie_login', '2.5.0' );
 endif;
 
 if ( !function_exists('wp_login') ) :
@@ -145,16 +158,18 @@ if ( !function_exists('wp_login') ) :
  * failure can utilize it later.
  *
  * @since 1.2.2
- * @deprecated Use wp_signon()
+ * @deprecated 2.5.0 Use wp_signon()
+ * @see wp_signon()
+ *
  * @global string $error Error when false is returned
  *
- * @param string $username User's username
- * @param string $password User's password
- * @param bool $deprecated Not used
+ * @param string $username   User's username
+ * @param string $password   User's password
+ * @param string $deprecated Not used
  * @return bool False on login failure, true on successful check
  */
 function wp_login($username, $password, $deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_signon()' );
+	_deprecated_function( __FUNCTION__, '2.5.0', 'wp_signon()' );
 	global $error;
 
 	$user = wp_authenticate($username, $password);
@@ -166,7 +181,7 @@ function wp_login($username, $password, $deprecated = '') {
 	return false;
 }
 else :
-	_deprecated_function( 'wp_login', '2.5', 'wp_signon()' );
+	_deprecated_function( 'wp_login', '2.5.0', 'wp_signon()' );
 endif;
 
 /**
@@ -177,16 +192,17 @@ endif;
  *
  * @since 2.2.0
  * @deprecated 3.5.0
- * @link http://wordpress.org/plugins/atom-publishing-protocol/
+ *
+ * @link https://wordpress.org/plugins/atom-publishing-protocol/
  */
-if ( ! class_exists( 'wp_atom_server' ) ) {
+if ( ! class_exists( 'wp_atom_server', false ) ) {
 	class wp_atom_server {
 		public function __call( $name, $arguments ) {
-			_deprecated_function( __CLASS__ . '::' . $name, '3.5', 'the Atom Publishing Protocol plugin' );
+			_deprecated_function( __CLASS__ . '::' . $name, '3.5.0', 'the Atom Publishing Protocol plugin' );
 		}
 
 		public static function __callStatic( $name, $arguments ) {
-			_deprecated_function( __CLASS__ . '::' . $name, '3.5', 'the Atom Publishing Protocol plugin' );
+			_deprecated_function( __CLASS__ . '::' . $name, '3.5.0', 'the Atom Publishing Protocol plugin' );
 		}
 	}
-}
\ No newline at end of file
+}