Changeset 18513

Timestamp:

08/05/2011 04:57:31 PM (15 years ago)

Author:

ryan

Message:

Deprecate get_userdatabylogin() and get_user_by_email(). Props scribu. fixes #18333

Location:

trunk

Files:

• . (modified) (1 prop)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/pluggable-deprecated.php (modified) (2 diffs)
• wp-includes/pluggable.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)
• wp-login.php (modified) (2 diffs)
• wp-mail.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -646 +646 @@
                 $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
 
-        $site_user = get_user_by_email( $email );
+        $site_user = get_user_by( 'email', $email );
         if ( ! is_email( $email ) )
                 $errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );

trunk/wp-includes/capabilities.php

@@ -448 +448 @@
                         $this->data = get_userdata( $id );
                 else
-                        $this->data = get_userdatabylogin( $name );
+                        $this->data = get_user_by('login', $name );
 
                 if ( empty( $this->data->ID ) )

trunk/wp-includes/pluggable-deprecated.php

@@ -37 +37 @@
 endif;
 
+if ( !function_exists('get_userdatabylogin') ) :
+/**
+ * Retrieve user info by login name.
+ *
+ * @since 0.71
+ * @deprecated 2.5
+ * @deprecated Use get_user_by('login')
+ *
+ * @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')" );
+        return get_user_by('login', $user_login);
+}
+endif;
+
+if ( !function_exists('get_user_by_email') ) :
+/**
+ * Retrieve user info by email.
+ *
+ * @since 2.5
+ * @deprecated 2.5
+ * @deprecated Use get_user_by('email')
+ *
+ * @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')" );
+        return get_user_by('email', $email);
+}
+endif;
+
 if ( !function_exists('wp_setcookie') ) :
 /**
@@ -55 +89 @@
 function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {
         _deprecated_function( __FUNCTION__, '2.5', 'wp_set_auth_cookie()' );
-        $user = get_userdatabylogin($username);
+        $user = get_user_by('login', $username);
         wp_set_auth_cookie($user->ID, $remember);
 }

trunk/wp-includes/pluggable.php

@@ -200 +200 @@
 
         return $user;
-}
-endif;
-
-if ( !function_exists('get_userdatabylogin') ) :
-/**
- * Retrieve user info by login name.
- *
- * @since 0.71
- *
- * @param string $user_login User's username
- * @return bool|object False on failure, User DB row object
- */
-function get_userdatabylogin($user_login) {
-        return get_user_by('login', $user_login);
-}
-endif;
-
-if ( !function_exists('get_user_by_email') ) :
-/**
- * Retrieve user info by email.
- *
- * @since 2.5
- *
- * @param string $email User's email address
- * @return bool|object False on failure, User DB row object
- */
-function get_user_by_email($email) {
-        return get_user_by('email', $email);
 }
 endif;
@@ -595 +567 @@
         }
 
-        $user = get_userdatabylogin($username);
+        $user = get_user_by('login', $username);
         if ( ! $user ) {
                 do_action('auth_cookie_bad_username', $cookie_elements);

trunk/wp-includes/post.php

@@ -3396 +3396 @@
                                 //Do we have an author id or an author login?
                                 if ( 0 == intval($post_author) ) {
-                                        $post_author = get_userdatabylogin($post_author);
+                                        $post_author = get_user_by('login', $post_author);
                                         if ( empty($post_author) )
                                                 continue;

trunk/wp-includes/user.php

@@ -1297 +1297 @@
  */
 function username_exists( $username ) {
-        if ( $user = get_userdatabylogin( $username ) ) {
+        if ( $user = get_user_by('login', $username ) ) {
                 return $user->ID;
         } else {
@@ -1314 +1314 @@
  */
 function email_exists( $email ) {
-        if ( $user = get_user_by_email($email) )
+        if ( $user = get_user_by('email', $email) )
                 return $user->ID;
 

trunk/wp-login.php

@@ -172 +172 @@
 
         if ( strpos($_POST['user_login'], '@') ) {
-                $user_data = get_user_by_email(trim($_POST['user_login']));
+                $user_data = get_user_by('email', trim($_POST['user_login']));
                 if ( empty($user_data) )
                         $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
         } else {
                 $login = trim($_POST['user_login']);
-                $user_data = get_userdatabylogin($login);
+                $user_data = get_user_by('login', $login);
         }
 
@@ -545 +545 @@
         if ( !empty($_POST['log']) && !force_ssl_admin() ) {
                 $user_name = sanitize_user($_POST['log']);
-                if ( $user = get_userdatabylogin($user_name) ) {
+                if ( $user = get_user_by('login', $user_name) ) {
                         if ( get_user_option('use_ssl', $user->ID) ) {
                                 $secure_cookie = true;

trunk/wp-mail.php

@@ -114 +114 @@
                                 if ( is_email($author) ) {
                                         echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
-                                        $userdata = get_user_by_email($author);
+                                        $userdata = get_user_by('email', $author);
                                         if ( empty($userdata) ) {
                                                 $author_found = false;