Ticket #40458: 40458.2.patch

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

@@ -240 +240 @@
                         case 'siteurl':
                         case 'post_count':
                         case 'home':
+                        default: // Custom properties added through the 'site_details' filter.
                                 if ( ! did_action( 'ms_loaded' ) ) {
                                         return null;
                                 }
+
                                 $details = $this->get_details();
-                                return $details->$key;
+                                if ( isset( $details->$key ) ) {
+                                        return $details->$key;
+                                }
                 }
 
                 return null;
@@ -275 +279 @@
                                         return false;
                                 }
                                 return true;
+                        default: // Custom properties added through the 'site_details' filter.
+                                if ( ! did_action( 'ms_loaded' ) ) {
+                                        return false;
+                                }
+
+                                $details = $this->get_details();
+                                if ( isset( $details->$key ) ) {
+                                        return true;
+                                }
                 }
 
                 return false;

tests/phpunit/tests/multisite/siteDetails.php

@@ -144 +144 @@
 
                 $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;
+        }
 }
 
 endif;