WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2012-03-21 17:32:28 +00:00
parent 35a551427a
commit f248632c42
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/theme.php
View File

@ -50,7 +50,7 @@ function wp_get_themes( $args = array() ) {
if ( is_multisite() && null !== $args['allowed'] ) { if ( is_multisite() && null !== $args['allowed'] ) {
$allowed = $args['allowed']; $allowed = $args['allowed'];
if ( 'network' === $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 ) elseif ( 'site' === $allowed )
$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) ); $theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
elseif ( $allowed ) elseif ( $allowed )
@ -60,6 +60,7 @@ function wp_get_themes( $args = array() ) {
} }
$themes = array(); $themes = array();
static $_themes = array();
foreach ( $theme_directories as $theme => $theme_root ) { foreach ( $theme_directories as $theme => $theme_root ) {
if ( isset( $_themes[ $theme ] ) ) if ( isset( $_themes[ $theme ] ) )