Changeset 35299

Timestamp:

10/20/2015 06:22:41 PM (9 years ago)

Author:

obenland

Message:

Site Icon: Get site icon ID only when needed.

Cuts down on unnecessary queries, especially in environments that rely on
post meta a lot. Reverts [32997].

Props ap.koponen, swissspidy.
Fixes #34368.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-site-icon.php (modified) (1 diff)
• tests/phpunit/tests/image/site_icon.php (modified) (1 diff)
• tests/phpunit/tests/post/getPostClass.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-site-icon.php

@@ -230 +230 @@
      */
     public function get_post_metadata( $value, $post_id, $meta_key, $single ) {
-        $site_icon_id = get_option( 'site_icon' );
-
-        if ( $post_id == $site_icon_id && '_wp_attachment_backup_sizes' == $meta_key && $single ) {
-            add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
+        if ( $single && '_wp_attachment_backup_sizes' === $meta_key ) {
+            $site_icon_id = get_option( 'site_icon' );
+
+            if ( $post_id == $site_icon_id ) {
+                add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
+            }
         }
 

trunk/tests/phpunit/tests/image/site_icon.php

@@ -128 +128 @@
     }
 
+    /**
+     * @ticket 34368
+     */
+    function test_get_post_metadata() {
+        $attachment_id = $this->_insert_attachment();
+        update_option( 'site_icon', $attachment_id );
+
+        $this->wp_site_icon->get_post_metadata( '', $attachment_id, '_some_post_meta', true );
+        $this->assertFalse( has_filter( 'intermediate_image_sizes', array( $this->wp_site_icon, 'intermediate_image_sizes' ) ) );
+
+        $this->wp_site_icon->get_post_metadata( '', $attachment_id, '_wp_attachment_backup_sizes', true );
+        $this->assertSame( 10,  has_filter( 'intermediate_image_sizes', array( $this->wp_site_icon, 'intermediate_image_sizes' ) ) );
+
+        wp_delete_attachment( $attachment_id, true );
+    }
+
     function _custom_test_sizes( $sizes ) {
         $sizes[] = 321;

trunk/tests/phpunit/tests/post/getPostClass.php

@@ -121 +121 @@
         $found = get_post_class( '', $this->post_id );
 
-        // The 'site_icon' option check adds a query during unit tests. See {@see WP_Site_Icon::get_post_metadata()}.
-        $expected_num_queries = $num_queries + 1;
-
-        $this->assertSame( $expected_num_queries, $wpdb->num_queries );
+        $this->assertSame( $num_queries, $wpdb->num_queries );
     }
 }