Changeset 40478 for trunk

Timestamp:

04/19/2017 06:51:25 PM (7 years ago)

Author:

ocean90

Message:

Multisite: After [37918] add support for retrieving custom site properties set by the site_details filter.

The behaviour was previously possible with the blog_details filter and get_blog_details() function. The former is deprecated since [38936].
This change adjusts the magic methods of WP_Site to also check if $key exists in WP_Site::get_details().

Fixes #40458.

Location:

trunk

Files:

• src/wp-includes/class-wp-site.php (modified) (2 diffs)
• tests/phpunit/tests/multisite/siteDetails.php (modified) (1 diff)

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

@@ -241 +241 @@
             case 'post_count':
             case 'home':
+            default: // Custom properties added by 'site_details' filter.
                 if ( ! did_action( 'ms_loaded' ) ) {
                     return null;
                 }
+
                 $details = $this->get_details();
-                return $details->$key;
+                if ( isset( $details->$key ) ) {
+                    return $details->$key;
+                }
         }
 
@@ -276 +280 @@
                 }
                 return true;
+            default: // Custom properties added by 'site_details' filter.
+                if ( ! did_action( 'ms_loaded' ) ) {
+                    return false;
+                }
+
+                $details = $this->get_details();
+                if ( isset( $details->$key ) ) {
+                    return true;
+                }
         }
 

trunk/tests/phpunit/tests/multisite/siteDetails.php

@@ -145 +145 @@
         $this->assertNotFalse( $cached_details );
     }
+
+    public function test_site_details_filter_with_blogname() {
+        add_filter( 'site_details', array( $this, '_filter_site_details_blogname' ) );
+        $site = get_site();
+        $blogname = $site->blogname;
+        remove_filter( 'site_details', array( $this, '_filter_site_details_blogname' ) );
+
+        $this->assertSame( 'Foo Bar', $blogname );
+    }
+
+    public function _filter_site_details_blogname( $details ) {
+        $details->blogname = 'Foo Bar';
+        return $details;
+    }
+
+    /**
+     * @ticket 40458
+     */
+    public function test_site_details_filter_with_custom_value_isetter() {
+        add_filter( 'site_details', array( $this, '_filter_site_details_custom_value' ) );
+        $site = get_site();
+        $custom_value_isset = isset( $site->custom_value );
+        remove_filter( 'site_details', array( $this, '_filter_site_details_custom_value' ) );
+
+        $this->assertTrue( $custom_value_isset );
+    }
+
+    /**
+     * @ticket 40458
+     */
+    public function test_site_details_filter_with_custom_value_getter() {
+        add_filter( 'site_details', array( $this, '_filter_site_details_custom_value' ) );
+        $site = get_site();
+        $custom_value = $site->custom_value;
+        remove_filter( 'site_details', array( $this, '_filter_site_details_custom_value' ) );
+
+        $this->assertSame( 'foo', $custom_value );
+    }
+
+    public function _filter_site_details_custom_value( $details ) {
+        $details->custom_value = 'foo';
+        return $details;
+    }
 }