Changeset 9354

Timestamp:

01/13/2015 10:14:37 PM (10 years ago)

Author:

imath

Message:

Make sure sorting blogs alphabetically is fetching items

Since r9328 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 #6118

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-classes.php (modified) (1 diff)
• tests/phpunit/testcases/blogs/class-bp-blogs-blog.php (modified) (1 diff)

trunk/src/bp-blogs/bp-blogs-classes.php

@@ -157 +157 @@
                 break;
             case 'alphabetical':
-                $order_sql = "ORDER BY bm2.meta_value ASC";
+                $order_sql = "ORDER BY bm_name.meta_value ASC";
                 break;
             case 'newest':

trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php

@@ -132 +132 @@
         wpmu_delete_blog( $b, true );
     }
+
+    /**
+     * @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 );
+        }
+    }
 }