Ticket #28436: 28436.2.diff

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

@@ -1104 +1104 @@
                 /**
                  * Filter the array of themes allowed on the site or network.
                  *
-                 * @since MU
+                 * @since 4.2
                  *
                  * @param array $allowed_themes An array of theme stylesheet names.
                  */
-                $network = (array) apply_filters( 'allowed_themes', self::get_allowed_on_network() );
+                $network = (array) apply_filters( 'allowed_themes_combined', self::get_allowed_on_network(), $blog_id );
                 return $network + self::get_allowed_on_site( $blog_id );
         }
 
@@ -1122 +1122 @@
          */
         public static function get_allowed_on_network() {
                 static $allowed_themes;
-                if ( ! isset( $allowed_themes ) )
-                        $allowed_themes = (array) get_site_option( 'allowedthemes' );
+                if ( ! isset( $allowed_themes ) ) {
+                        /**
+                         * Filter the array of themes allowed on the network.
+                         *
+                         * @since 4.2
+                         *
+                         * @param array $allowed_themes An array of theme stylesheet names.
+                         */
+                        $allowed_themes = (array) apply_filters( 'allowed_themes', get_site_option( 'allowedthemes' ) );
+                }
                 return $allowed_themes;
         }
 
@@ -1191 +1199 @@
                         }
                 }
 
-                return (array) $allowed_themes[ $blog_id ];
+                /**
+                 * Filter the array of themes allowed on the site.
+                 *
+                 * @since 4.2
+                 *
+                 * @param array $allowed_themes An array of theme stylesheet names.
+                 */
+                $allowed_themes = (array) apply_filters( 'allowed_themes_site', $allowed_themes[ $blog_id ], $blog_id );
+                return $allowed_themes;
         }
 
         /**

new file tests/phpunit/tests/multisite/theme.php

@@ +1 @@
+<?php
+
+if ( is_multisite() ) : /**
+ * Tests specific to networks in multisite.
+ *
+ * @group ms-network
+ * @group multisite
+ */ {
+        class Tests_Multisite_Theme extends WP_UnitTestCase {
+
+                function setUp() {
+                        global $wpdb;
+                        parent::setUp();
+                        $this->suppress = $wpdb->suppress_errors();
+
+                        $_SERVER['REMOTE_ADDR'] = '';
+                }
+
+                function tearDown() {
+                        global $wpdb;
+                        $wpdb->suppress_errors( $this->suppress );
+                        parent::tearDown();
+                }
+
+                function test_nav_menu_theme_filter_sends_blog_id() {
+                        $args = [ ];
+
+                        add_filter( 'allowed_themes_combined', function () use ( &$args ) {
+                                $args = func_get_args();
+                        }, 10, 2 );
+
+                        $blog_id = 2;
+
+                        WP_Theme::get_allowed( $blog_id );
+
+                        $this->assertNotEmpty( $args );
+                        $this->assertEquals( 2, count( $args ) );
+                        $this->assertEquals( $blog_id, $args[1] );
+                }
+
+        }
+}
+
+endif;