<!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>[BuddyPress][9354] trunk: Make sure sorting blogs alphabetically is fetching items</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="http://buddypress.trac.wordpress.org/changeset/9354">9354</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9354","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-13 22:14:37 +0000 (Tue, 13 Jan 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'>Make sure sorting blogs alphabetically is fetching items
Since <a href="http://buddypress.trac.wordpress.org/changeset/9328">r9328</a> we have changed the table aliases used in the sql query to get the blogs, but we forgot to edit the order clause so that the alphabetical type uses the new table alias (bm_name).
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6118">#6118</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsclassesphp">trunk/src/bp-blogs/bp-blogs-classes.php</a></li>
<li><a href="#trunktestsphpunittestcasesblogsclassbpblogsblogphp">trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsclassesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-classes.php 2015-01-13 21:09:30 UTC (rev 9353)
+++ trunk/src/bp-blogs/bp-blogs-classes.php 2015-01-13 22:14:37 UTC (rev 9354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $order_sql = "ORDER BY bm.meta_value DESC";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'alphabetical':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $order_sql = "ORDER BY bm2.meta_value ASC";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $order_sql = "ORDER BY bm_name.meta_value ASC";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'newest':
</span><span class="cx" style="display: block; padding: 0 10px"> $order_sql = "ORDER BY wb.registered DESC";
</span></span></pre></div>
<a id="trunktestsphpunittestcasesblogsclassbpblogsblogphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php 2015-01-13 21:09:30 UTC (rev 9353)
+++ trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php 2015-01-13 22:14:37 UTC (rev 9354)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,4 +131,67 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_current_user( $old_user );
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $b, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group get_order_by
+ */
+ public function test_get_order_by() {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ $old_user = get_current_user_id();
+
+ $u = $this->factory->user->create();
+ $this->set_current_user( $u );
+ $bs = array(
+ 'foobar' => $this->factory->blog->create( array(
+ 'title' => 'Foo Bar Blog',
+ 'user_id' => $u,
+ 'path' => '/path' . rand() . time() . '/',
+ ) ),
+ 'barfoo' => $this->factory->blog->create( array(
+ 'title' => 'Bar foo Blog',
+ 'user_id' => $u,
+ 'path' => '/path' . rand() . time() . '/',
+ ) ),
+ );
+
+ bp_blogs_record_existing_blogs();
+
+ // make the blog public or it won't turn up in generic results
+ foreach ( $bs as $b ) {
+ update_blog_option( $b, 'blog_public', '1' );
+ }
+
+ // Used to make sure barfoo is older than foobar
+ $b_time = date_i18n( 'Y-m-d H:i:s', strtotime( '-5 minutes' ) );
+
+ /* Alphabetical */
+ $blogs = BP_Blogs_Blog::get( 'alphabetical', false, false, $u );
+ $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+ $this->assertEquals( array( $bs['barfoo'], $bs['foobar'] ), $blog_ids );
+
+ /* Newest */
+ update_blog_details( $bs['barfoo'], array( 'registered' => $b_time ) );
+ $blogs = BP_Blogs_Blog::get( 'newest', false, false, $u );
+ $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+ $this->assertEquals( array( $bs['foobar'], $bs['barfoo'] ), $blog_ids );
+
+ /* Active */
+ bp_blogs_update_blogmeta( $bs['barfoo'], 'last_activity', $b_time );
+ $blogs = BP_Blogs_Blog::get( 'active', false, false, $u );
+ $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+ $this->assertEquals( array( $bs['foobar'],$bs['barfoo'] ), $blog_ids );
+
+ /* Random */
+ $blogs = BP_Blogs_Blog::get( 'random', false, false, $u );
+ $this->assertTrue( 2 == count( $blogs['blogs'] ) );
+
+ $this->set_current_user( $old_user );
+
+ foreach ( $bs as $d ) {
+ wpmu_delete_blog( $d, true );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>