Context Navigation

← Previous Changeset
Next Changeset →

Changeset 21699

Timestamp:

09/03/2012 06:11:42 PM (14 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:

: 1 edited

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

Legend:

: Unmodified
: Added
: Removed

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

Property svn:mergeinfo set to
/branches/3.1/wp-includes/class-wp-theme.php 18031
/branches/3.3/wp-includes/class-wp-theme.php 20543
/trunk/wp-includes/class-wp-theme.php 18512,21503,21686

-              r21615
+              r21699
          */
         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 );
+        }

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 21699

Legend:

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

Download in other formats:

/branches/3.1/wp-includes/class-wp-theme.php	18031
/branches/3.3/wp-includes/class-wp-theme.php	20543
/trunk/wp-includes/class-wp-theme.php	18512,21503,21686