Changeset 20238

Timestamp:

03/21/2012 05:32:28 PM (13 years ago)

Author:

nacin

Message:

WP_Theme::get_allowed_on_network() doesn't take a blog_id argument. props duck_. Restore static declaration accidentally removed in [20193]. see #20103.

File:

• trunk/wp-includes/theme.php (modified) (2 diffs)

trunk/wp-includes/theme.php

@@ -51 +51 @@
         $allowed = $args['allowed'];
         if ( 'network' === $allowed )
-            $theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network( $args['blog_id'] ) );
+            $theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
         elseif ( 'site' === $allowed )
             $theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
@@ -61 +61 @@
 
     $themes = array();
+    static $_themes = array();
 
     foreach ( $theme_directories as $theme => $theme_root ) {