Ticket #28436: 28436.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;
         }
 
         /**