From f248632c4242a627672e64c18fbb7a517407b174 Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 21 Mar 2012 17:32:28 +0000 Subject: [PATCH] WP_Theme::get_allowed_on_network() doesn't take a blog_id argument. props duck_. Restore static declaration accidentally removed in [20193]. see #20103. git-svn-id: http://svn.automattic.com/wordpress/trunk@20238 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/theme.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 97be97091..3bf9859c1 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -50,7 +50,7 @@ function wp_get_themes( $args = array() ) { if ( is_multisite() && null !== $args['allowed'] ) { $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'] ) ); elseif ( $allowed ) @@ -60,6 +60,7 @@ function wp_get_themes( $args = array() ) { } $themes = array(); + static $_themes = array(); foreach ( $theme_directories as $theme => $theme_root ) { if ( isset( $_themes[ $theme ] ) )