Changeset 25590

Timestamp:

09/24/2013 01:19:27 AM (11 years ago)

Author:

nacin

Message:

Revert [25446] now that wp_blogs.archived is no longer an ENUM field. see #14511.

Location:

trunk

Files:

• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/ms.php (modified) (1 diff)

trunk/src/wp-includes/ms-functions.php

@@ -2043 +2043 @@
 
     if ( isset( $args['archived'] ) )
-        $query .= $wpdb->prepare( "AND archived = %s ", (int) $args['archived'] ); // ENUM field
+        $query .= $wpdb->prepare( "AND archived = %d ", $args['archived'] );
 
     if ( isset( $args['mature'] ) )

trunk/tests/phpunit/tests/ms.php

@@ -1090 +1090 @@
         $this->assertCount( 0, wp_get_sites( array( 'offset' => 20 ) ) );
     }
-
-    /**
-     * Test the 'archived' argument for wp_get_sites().
-     *
-     * archived is an ENUM, not an integer field.
-     * ENUM('0', '1') means '0' is index 1 and '1' is index 2.
-     * `WHERE archived = 1` is like saying `WHERE archived = '0'`.
-     * `WHERE archived = 0` would produce no results.
-     * 
-     * @ticket 14511
-     */
-    function test_wp_get_sites_archived_enum() {
-        global $wpdb;
-        $id = $this->factory->blog->create( array( 'site_id' => 2, 'meta' => array( 'archived' => '1' ) ) );
-        $this->factory->blog->create(       array( 'site_id' => 2, 'meta' => array( 'archived' => '0' ) ) );
-        $results = wp_get_sites( array( 'network_id' => 2, 'archived' => 1 ) );
-        $this->assertCount( 1, $results );
-        $this->assertEquals( $id, $results[0]['blog_id'], "This query is wrong:\n" . $wpdb->last_query );
-    }
 }