golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use bool for allowed themes. Props PeteMall. see #14897 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-11-08 19:40:05 +00:00
parent 0ea71e1e45
commit 39c1f5dc43
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/class-wp-ms-themes-list-table.php
View File

@ -58,7 +58,8 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
$current = get_site_transient( 'update_themes' );
foreach ( (array) $themes['all'] as $key => $theme ) {
if ( array_key_exists( $theme['Template'], $allowed_themes ) ) {
$theme_key = esc_html( $theme['Stylesheet'] );
if ( isset( $allowed_themes [ $theme_key ] ) ) {
$themes['all'][$key]['enabled'] = true;
$themes['enabled'][$key] = $themes['all'][$key];
}

4
wp-admin/network/themes.php
View File

@ -23,7 +23,7 @@ if ( $action ) {
$allowed_themes = get_site_option( 'allowedthemes' );
switch ( $action ) {
case 'network-enable':
$allowed_themes[ $_GET['theme'] ] = 1;
$allowed_themes[ $_GET['theme'] ] = true;
update_site_option( 'allowedthemes', $allowed_themes );
wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message
exit;
@ -41,7 +41,7 @@ if ( $action ) {
exit;
}
foreach( (array) $themes as $theme )
$allowed_themes[ $theme ] = 1;
$allowed_themes[ $theme ] = true;
update_site_option( 'allowedthemes', $allowed_themes );
break;
case 'network-disable-selected':