<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45708] trunk: Users: Deprecate `update_user_status()` in favor of `wp_update_user()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45708">45708</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45708","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-08-01 11:27:28 +0000 (Thu, 01 Aug 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Users: Deprecate `update_user_status()` in favor of `wp_update_user()`.
Props spacedmonkey, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/45747">#45747</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpAuthenticateSpamCheckphp">trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2019-08-01 02:24:08 UTC (rev 45707)
+++ trunk/src/wp-admin/includes/ms.php 2019-08-01 11:27:28 UTC (rev 45708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,59 +304,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Update the status of a user in the database.
- *
- * Used in core to mark a user as spam or "ham" (not spam) in Multisite.
- *
- * @since 3.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param int $id The user ID.
- * @param string $pref The column in the wp_users table to update the user's status
- * in (presumably user_status, spam, or deleted).
- * @param int $value The new status for the user.
- * @param null $deprecated Deprecated as of 3.0.2 and should not be used.
- * @return int The initially passed $value.
- */
-function update_user_status( $id, $pref, $value, $deprecated = null ) {
- global $wpdb;
-
- if ( null !== $deprecated ) {
- _deprecated_argument( __FUNCTION__, '3.0.2' );
- }
-
- $wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
-
- $user = new WP_User( $id );
- clean_user_cache( $user );
-
- if ( $pref == 'spam' ) {
- if ( $value == 1 ) {
- /**
- * Fires after the user is marked as a SPAM user.
- *
- * @since 3.0.0
- *
- * @param int $id ID of the user marked as SPAM.
- */
- do_action( 'make_spam_user', $id );
- } else {
- /**
- * Fires after the user is marked as a HAM user. Opposite of SPAM.
- *
- * @since 3.0.0
- *
- * @param int $id ID of the user marked as HAM.
- */
- do_action( 'make_ham_user', $id );
- }
- }
-
- return $value;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Cleans the user cache for a specific user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2019-08-01 02:24:08 UTC (rev 45707)
+++ trunk/src/wp-admin/network/users.php 2019-08-01 11:27:28 UTC (rev 45708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,22 +76,33 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $userfunction = 'all_spam';
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $user_id, true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $blogs as $details ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $details->userblog_id != get_network()->site_id ) { // main blog not a spam !
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $details->userblog_id, 'spam', '1' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_status( $user_id, 'spam', '1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $user_data = $user->to_array();
+ $user_data['spam'] = '1';
+
+ wp_update_user( $user_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'notspam':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = get_userdata( $user_id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $userfunction = 'all_notspam';
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $user_id, true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $blogs as $details ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $details->userblog_id, 'spam', '0' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_status( $user_id, 'spam', '0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_data = $user->to_array();
+ $user_data['spam'] = '0';
+
+ wp_update_user( $user_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2019-08-01 02:24:08 UTC (rev 45707)
+++ trunk/src/wp-includes/ms-deprecated.php 2019-08-01 11:27:28 UTC (rev 45708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,3 +685,48 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Update the status of a user in the database.
+ *
+ * Previously used in core to mark a user as spam or "ham" (not spam) in Multisite.
+ *
+ * @since 3.0.0
+ * @deprecated 5.3.0 Use wp_update_user()
+ * @see wp_update_user()
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param int $id The user ID.
+ * @param string $pref The column in the wp_users table to update the user's status
+ * in (presumably user_status, spam, or deleted).
+ * @param int $value The new status for the user.
+ * @param null $deprecated Deprecated as of 3.0.2 and should not be used.
+ * @return int The initially passed $value.
+ */
+function update_user_status( $id, $pref, $value, $deprecated = null ) {
+ global $wpdb;
+
+ _deprecated_function( __FUNCTION__, '5.3.0', 'wp_update_user()' );
+
+ if ( null !== $deprecated ) {
+ _deprecated_argument( __FUNCTION__, '3.0.2' );
+ }
+
+ $wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
+
+ $user = new WP_User( $id );
+ clean_user_cache( $user );
+
+ if ( $pref == 'spam' ) {
+ if ( $value == 1 ) {
+ /** This filter is documented in wp-includes/user.php */
+ do_action( 'make_spam_user', $id );
+ } else {
+ /** This filter is documented in wp-includes/user.php */
+ do_action( 'make_ham_user', $id );
+ }
+ }
+
+ return $value;
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2019-08-01 02:24:08 UTC (rev 45707)
+++ trunk/src/wp-includes/user.php 2019-08-01 11:27:28 UTC (rev 45708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1468,14 +1468,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Most of the `$userdata` array fields have filters associated with the values. Exceptions are
</span><span class="cx" style="display: block; padding: 0 10px"> * 'ID', 'rich_editing', 'syntax_highlighting', 'comment_shortcuts', 'admin_color', 'use_ssl',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'user_registered', and 'role'. The filters have the prefix 'pre_user_' followed by the field
- * name. An example using 'description' would have the filter called, 'pre_user_description' that
- * can be hooked into.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'user_registered', 'spam', and 'role'. The filters have the prefix 'pre_user_' followed by the
+ * field name. An example using 'description' would have the filter called, 'pre_user_description'
+ * that can be hooked into.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.6.0 The `aim`, `jabber`, and `yim` fields were removed as default user contact
</span><span class="cx" style="display: block; padding: 0 10px"> * methods for new installations. See wp_get_user_contact_methods().
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 The user's locale can be passed to `$userdata`.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.3.0 The `spam` field can be passed to `$userdata` (Multisite only).
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1509,6 +1510,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $use_ssl Whether the user should always access the admin over
</span><span class="cx" style="display: block; padding: 0 10px"> * https. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $user_registered Date the user registered. Format is 'Y-m-d H:i:s'.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type bool $spam Multisite only. Whether the user is marked as spam.
+ * Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string|bool $show_admin_bar_front Whether to display the Admin Bar for the user on the
</span><span class="cx" style="display: block; padding: 0 10px"> * site's front end. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $role User's role.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1644,6 +1647,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isset( $userdata['spam'] ) && ! is_multisite() ) {
+ return new WP_Error( 'no_spam', __( 'Sorry, marking a user as spam is only supported on Multisite.' ) );
+ }
+
+ $spam = empty( $userdata['spam'] ) ? 0 : (bool) $userdata['spam'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $nickname = empty( $userdata['nickname'] ) ? $user_login : $userdata['nickname'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1723,7 +1733,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['admin_color'] = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta['use_ssl'] = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['use_ssl'] = empty( $userdata['use_ssl'] ) ? 0 : (bool) $userdata['use_ssl'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_registered = empty( $userdata['user_registered'] ) ? gmdate( 'Y-m-d H:i:s' ) : $userdata['user_registered'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1752,6 +1762,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $data + compact( 'user_login' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() ) {
+ $data = $data + compact( 'spam' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters user data before the record is created or updated.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1848,6 +1862,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User $old_user_data Object containing user's data prior to update.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'profile_update', $user_id, $old_user_data );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isset( $userdata['spam'] ) && $userdata['spam'] != $old_user_data->spam ) {
+ if ( $userdata['spam'] == 1 ) {
+ /**
+ * Fires after the user is marked as a SPAM user.
+ *
+ * @since 3.0.0
+ *
+ * @param int $user_id ID of the user marked as SPAM.
+ */
+ do_action( 'make_spam_user', $user_id );
+ } else {
+ /**
+ * Fires after the user is marked as a HAM user. Opposite of SPAM.
+ *
+ * @since 3.0.0
+ *
+ * @param int $user_id ID of the user marked as HAM.
+ */
+ do_action( 'make_ham_user', $user_id );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately after a new user is registered.
</span></span></pre></div>
<a id="trunktestsphpunittestsusermultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php 2019-08-01 02:24:08 UTC (rev 45707)
+++ trunk/tests/phpunit/tests/user/multisite.php 2019-08-01 11:27:28 UTC (rev 45708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => $spam_username,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_status( $spam_user_id, 'spam', '1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_user( array( 'ID' => $spam_user_id, 'spam' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_user_spammy( $spam_username ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_user_spammy( 'testuser1' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpAuthenticateSpamCheckphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php 2019-08-01 02:24:08 UTC (rev 45707)
+++ trunk/tests/phpunit/tests/user/wpAuthenticateSpamCheck.php 2019-08-01 11:27:28 UTC (rev 45708)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_authenticate_spam_check_returns_wp_error_when_flagged() {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_status( $user_id, 'spam', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_user( array( 'ID' => $user_id, 'spam' => '1' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_user = wp_authenticate_spam_check( $user );
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_user( $user_id );
</span></span></pre>
</div>
</div>
</body>
</html>