Changeset 21699 for branches/3.4/wp-includes/class-wp-theme.php

Timestamp:

09/03/2012 06:11:42 PM (13 years ago)

Author:

nacin

Message:

Restore the 'allowed_themes' filter.

This filter has wrapped the network-wide themes, outside of the network-wide
allowed function (dating back to MU), hence the unusual placement. This restores
previous behavior; we will introduce new filters to enable greater flexibility.

see #21099.
for the 3.4 branch.

File:

• branches/3.4/wp-includes/class-wp-theme.php (modified) (1 diff, 1 prop)

branches/3.4/wp-includes/class-wp-theme.php

@@ -1072 +1072 @@
      */
     public static function get_allowed( $blog_id = null ) {
-        return self::get_allowed_on_network() + self::get_allowed_on_site( $blog_id );
+        $network = (array) apply_filters( 'allowed_themes', self::get_allowed_on_network() );
+        return $network + self::get_allowed_on_site( $blog_id );
     }