<!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>[39439] branches/4.7: REST API: Disable `DELETE` requests for users in multisite.</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 { 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/39439">39439</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/39439","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-12-02 22:15:32 +0000 (Fri, 02 Dec 2016)</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'>REST API: Disable `DELETE` requests for users in multisite.

In wp-admin, users are removed from individual sites rather than deleted. A user can only be deleted from the network admin.
Until support for a PUT request that removes a user's site and content associations is available, DELETE requests are disabled to avoid possible issues with lost content.

Merges <a href="https://core.trac.wordpress.org/changeset/34938">[34938]</a> onto 4.7 branch.

Props jnylen0, rachelbaker.
Fixes <a href="https://core.trac.wordpress.org/ticket/38962">#38962</a> for 4.7.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludesrestapiendpointsclasswprestuserscontrollerphp">branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</a></li>
<li><a href="#branches47testsphpunittestsrestapirestuserscontrollerphp">branches/4.7/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.7 2016-12-02 22:10:01 UTC (rev 39438)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7  2016-12-02 22:15:32 UTC (rev 39439)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39419,39424,39426,39428,39430,39434,39436
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39419,39424,39426,39428,39430,39434,39436,39438
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpincludesrestapiendpointsclasswprestuserscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php        2016-12-02 22:10:01 UTC (rev 39438)
+++ branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php  2016-12-02 22:15:32 UTC (rev 39439)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,6 +701,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function delete_item( $request ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // We don't support delete requests in multisite.
+               if ( is_multisite() ) {
+                       return new WP_Error( 'rest_cannot_delete', __( 'The user cannot be deleted.' ), array( 'status' => 501 ) );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $id       = (int) $request['id'];
</span><span class="cx" style="display: block; padding: 0 10px">                $reassign = false === $request['reassign'] ? null : absint( $request['reassign'] );
</span><span class="cx" style="display: block; padding: 0 10px">                $force    = isset( $request['force'] ) ? (bool) $request['force'] : false;
</span></span></pre></div>
<a id="branches47testsphpunittestsrestapirestuserscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/rest-api/rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/rest-api/rest-users-controller.php       2016-12-02 22:10:01 UTC (rev 39438)
+++ branches/4.7/tests/phpunit/tests/rest-api/rest-users-controller.php 2016-12-02 22:15:32 UTC (rev 39439)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1643,6 +1643,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', false );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px">                $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $data['deleted'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1660,6 +1666,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', false );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = $this->server->dispatch( $request );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'force', 'false' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1683,6 +1696,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', false );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px">                $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( $data['deleted'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1699,6 +1718,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'DELETE', '/wp/v2/users/me' );
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', false );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = $this->server->dispatch( $request );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'force', 'false' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1740,6 +1766,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', false );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );
</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">@@ -1764,6 +1796,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', $reassign_id );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertEquals( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Check that the post has been updated correctly
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1782,6 +1820,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', 100 );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->assertErrorResponse( 'rest_user_invalid_reassign', $response, 400 );
</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">@@ -1812,8 +1856,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $request['force'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->server->dispatch( $request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $response = $this->server->dispatch( $request );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $test_post = get_post( $test_post );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'trash', $test_post->post_status );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1831,8 +1881,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $request['force'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', 'false' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->server->dispatch( $request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $response = $this->server->dispatch( $request );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $test_post = get_post( $test_post );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'trash', $test_post->post_status );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1850,8 +1906,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $request['force'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', '' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->server->dispatch( $request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $response = $this->server->dispatch( $request );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $test_post = get_post( $test_post );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 'trash', $test_post->post_status );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1869,8 +1931,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $request['force'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'reassign', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->server->dispatch( $request );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $response = $this->server->dispatch( $request );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Not implemented in multisite.
+               if ( is_multisite() ) {
+                       $this->assertErrorResponse( 'rest_cannot_delete', $response, 501 );
+                       return;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $test_post = get_post( $test_post );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( 0, $test_post->post_author );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre>
</div>
</div>

</body>
</html>