<!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>[32626] trunk: Provide all site flag data in objects returned by `get_blogs_of_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 { 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/32626">32626</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/32626","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>2015-05-27 21:22:09 +0000 (Wed, 27 May 2015)</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'>Provide all site flag data in objects returned by `get_blogs_of_user()`
Previously, `archived`, `spam`, and `deleted` properties were forced to `0` when returned by `get_blogs_of_user()`. This was originally introduced in <a href="https://core.trac.wordpress.org/changeset/21794">[21794]</a> as a way to prevent notices when properties were expected.
Instead, we can properly fill these properties with those retrieved from `get_blog_details()`.
Props realloc.
Fixes <a href="https://core.trac.wordpress.org/ticket/32281">#32281</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-05-27 19:58:38 UTC (rev 32625)
+++ trunk/src/wp-includes/user.php 2015-05-27 21:22:09 UTC (rev 32626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1175,9 +1175,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => $blog->path,
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $blog->site_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'siteurl' => $blog->siteurl,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'archived' => 0,
- 'spam' => 0,
- 'deleted' => 0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'archived' => $blog->archived,
+ 'spam' => $blog->spam,
+ 'deleted' => $blog->deleted,
</ins><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"> unset( $keys[ $wpdb->base_prefix . 'capabilities' ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1204,9 +1204,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => $blog->path,
</span><span class="cx" style="display: block; padding: 0 10px"> 'site_id' => $blog->site_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'siteurl' => $blog->siteurl,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'archived' => 0,
- 'spam' => 0,
- 'deleted' => 0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'archived' => $blog->archived,
+ 'spam' => $blog->spam,
+ 'deleted' => $blog->deleted,
</ins><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></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 2015-05-27 19:58:38 UTC (rev 32625)
+++ trunk/tests/phpunit/tests/user/multisite.php 2015-05-27 21:22:09 UTC (rev 32626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,9 +91,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_blog_details( $blog_ids[2], array( 'deleted' => 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Passing true as the second parameter should retrieve ALL sites, even if marked.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_ids_of_user = array_keys( get_blogs_of_user( $user1_id, true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blogs_of_user = get_blogs_of_user( $user1_id, true );
+ $blog_ids_of_user = array_keys( $blogs_of_user );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $blog_ids, $blog_ids_of_user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check if sites are flagged as expected.
+ $this->assertEquals( 1, $blogs_of_user[ $blog_ids[0] ]->spam );
+ $this->assertEquals( 1, $blogs_of_user[ $blog_ids[1] ]->archived );
+ $this->assertEquals( 1, $blogs_of_user[ $blog_ids[2] ]->deleted );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $blog_ids[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $blog_ids[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $blog_ids[2] );
</span></span></pre>
</div>
</div>
</body>
</html>