Skip to content

Don't show block themes in Customizer. #1991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anton-vlasenko wants to merge 13 commits into from
Closed

Don't show block themes in Customizer. #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2ff5027
Don't show block themes in Customizer.
anton-vlasenko Dec 1, 2021
288a52a
Add a unit test for WP_Customize_Manager::handle_load_themes_request.
anton-vlasenko Dec 3, 2021
b00cc53
Use the new method (WP_Theme::is_block_theme).
anton-vlasenko Dec 7, 2021
415bc4a
Fix typo.
anton-vlasenko Dec 7, 2021
d2814f1
Add messages to multiple assertions in same test.
hellofromtonya Dec 7, 2021
5987ea7
1. Don't hide block themes in Customizer.
anton-vlasenko Dec 10, 2021
bb28dfd
Display a warning and show activate button for block themes.
anton-vlasenko Dec 13, 2021
55676b8
Commit wip.
anton-vlasenko Dec 13, 2021
da75ba6
Show warning message in the popup window.
anton-vlasenko Dec 13, 2021
9bd48c8
Adds tests.
hellofromtonya Dec 13, 2021
0b2585d
Micro-optimization and alignment fix.
hellofromtonya Dec 13, 2021
88fa709
Fixes test syntax error and phpcs formatting.
hellofromtonya Dec 13, 2021
afd821b
Fixes failing test.
hellofromtonya Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions src/wp-admin/includes/theme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,21 @@ function customize_themes_print_templates() {
?>
<# } #>
</p></div>
<# } else if ( ! data.active && data.blockTheme ) { #>
<div class="notice notice-error notice-alt notice-large"><p>
<?php
_e( 'This theme doesn\'t support Customizer.' );
?>
<# if ( data.actions.activate ) { #>
<?php
printf(
/* translators: %s: URL to the themes page (also it activates the theme). */
' ' . __( 'However, you can still <a href="%s">activate this theme</a>, and use the Site Editor to customize it.' ),
'{{{ data.actions.activate }}}'
);
?>
<# } #>
</p></div>
<# } #>

<p class="theme-description">{{{ data.description }}}</p>
Expand All @@ -1025,10 +1040,20 @@ function customize_themes_print_templates() {
<# } #>
<?php } ?>

<# if ( data.compatibleWP && data.compatiblePHP ) { #>
<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></button>
<# if ( data.blockTheme ) { #>
<?php
/* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
?>
<# if ( data.compatibleWP && data.compatiblePHP && data.actions.activate ) { #>
<a href="{{{ data.actions.activate }}}" class="button button-primary activate" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
<# } #>
<# } else { #>
<button class="button button-primary disabled"><?php _e( 'Live Preview' ); ?></button>
<# if ( data.compatibleWP && data.compatiblePHP ) { #>
<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></button>
<# } else { #>
<button class="button button-primary disabled"><?php _e( 'Live Preview' ); ?></button>
<# } #>
<# } #>
<# } else { #>
<# if ( data.compatibleWP && data.compatiblePHP ) { #>
Expand Down
9 changes: 5 additions & 4 deletions src/wp-includes/class-wp-customize-manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5808,10 +5808,11 @@ public function handle_load_themes_request() {
if ( 'installed' === $theme_action ) {

// Load all installed themes from wp_prepare_themes_for_js().
$themes = array( 'themes' => wp_prepare_themes_for_js() );
foreach ( $themes['themes'] as &$theme ) {
$theme['type'] = 'installed';
$theme['active'] = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme['id'] );
$themes = array( 'themes' => array() );
foreach ( wp_prepare_themes_for_js() as $theme ) {
$theme['type'] = 'installed';
$theme['active'] = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme['id'] );
$themes['themes'][] = $theme;
}
} elseif ( 'wporg' === $theme_action ) {

Expand Down
50 changes: 40 additions & 10 deletions src/wp-includes/customize/class-wp-customize-theme-control.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,17 +242,47 @@ public function content_template() {
</div>
<div class="notice notice-success notice-alt"><p><?php _ex( 'Installed', 'theme' ); ?></p></div>
<# } else if ( 'installed' === data.theme.type ) { #>
<div class="theme-id-container">
<h3 class="theme-name" id="{{ data.section }}-{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
<div class="theme-actions">
<# if ( data.theme.compatibleWP && data.theme.compatiblePHP ) { #>
<button type="button" class="button button-primary preview-theme" aria-label="<?php echo esc_attr( $preview_label ); ?>" data-slug="{{ data.theme.id }}"><?php _e( 'Live Preview' ); ?></button>
<# } else { #>
<button type="button" class="button button-primary disabled" aria-label="<?php echo esc_attr( $preview_label ); ?>"><?php _e( 'Live Preview' ); ?></button>
<# } #>
<# if ( data.theme.blockTheme ) { #>
<div class="theme-id-container">
<h3 class="theme-name" id="{{ data.section }}-{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
<div class="theme-actions">
<# if ( data.theme.actions.activate ) { #>
<?php
/* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
?>
<a href="{{{ data.theme.actions.activate }}}" class="button button-primary activate" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
<# } #>
</div>
</div>
</div>
<div class="notice notice-success notice-alt"><p><?php _ex( 'Installed', 'theme' ); ?></p></div>
<div class="notice notice-error notice-alt"><p>
<?php
_e( 'This theme doesn\'t support Customizer.' );
?>
<# if ( data.theme.actions.activate ) { #>
<?php
echo ' ';
printf(
/* translators: %s: URL to the themes page (also it activates the theme). */
__( 'However, you can still <a href="%s">activate this theme</a>, and use the Site Editor to customize it.' ),
'{{{ data.theme.actions.activate }}}'
);
?>
<# } #>
</p></div>
<# } else { #>
<div class="theme-id-container">
<h3 class="theme-name" id="{{ data.section }}-{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
<div class="theme-actions">
<# if ( data.theme.compatibleWP && data.theme.compatiblePHP ) { #>
<button type="button" class="button button-primary preview-theme" aria-label="<?php echo esc_attr( $preview_label ); ?>" data-slug="{{ data.theme.id }}"><?php _e( 'Live Preview' ); ?></button>
<# } else { #>
<button type="button" class="button button-primary disabled" aria-label="<?php echo esc_attr( $preview_label ); ?>"><?php _e( 'Live Preview' ); ?></button>
<# } #>
</div>
</div>
<div class="notice notice-success notice-alt"><p><?php _ex( 'Installed', 'theme' ); ?></p></div>
<# } #>
<# } else { #>
<div class="theme-id-container">
<h3 class="theme-name" id="{{ data.section }}-{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
Expand Down
45 changes: 45 additions & 0 deletions tests/phpunit/tests/ajax/CustomizeManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,4 +714,49 @@ public function test_handle_dismiss_autosave_or_lock_request() {
$this->assertFalse( $this->_last_response_parsed['success'] );
$this->assertSame( 'no_autosave_revision_to_delete', $this->_last_response_parsed['data'] );
}

/**
* Test request for retrieving installed themes.
*
* @ticket 54549
* @covers WP_Customize_Manager::handle_load_themes_request
*/
public function test_wp_ajax_customize_load_themes_action() {
$arguments = array(
'changeset_uuid' => false,
'settings_previewed' => true,
'branching' => false,
);
new WP_Customize_Manager( $arguments );
wp_set_current_user( self::$admin_user_id );
$nonce = wp_create_nonce( 'switch_themes' );
$_POST['nonce'] = $nonce;
$_GET['nonce'] = $nonce;
$_REQUEST['nonce'] = $nonce;
$_POST['theme_action'] = 'installed';
$this->make_ajax_call( 'customize_load_themes' );
$response = $this->_last_response_parsed;
$this->assertIsArray( $response, 'Response is not an array' );

$this->assertArrayHasKey( 'success', $response, 'Response must have a "success" key' );
$this->assertTrue( $response['success'], 'Response was not "success"' );

$this->assertArrayHasKey( 'data', $response, 'Response must have a "data" key' );
$this->assertIsArray( $response['data'], 'The response "data" is not an array' );
$this->assertArrayHasKey( 'themes', $response['data'], 'The response data must have a "themes" key' );
$this->assertIsArray( $response['data']['themes'], 'Themes data is not an array' );
$this->assertNotEmpty( $response['data']['themes'], 'Themes data must not be empty' );

foreach ( $response['data']['themes'] as $theme ) {
$this->assertIsArray( $theme, 'Theme is not an array' );
$this->assertNotEmpty( $theme, 'Theme data must not be empty' );
$this->assertArrayHasKey( 'id', $theme, 'Theme data must have an "id" key' );
$this->assertNotEmpty( $theme['id'], 'Theme id cannot be empty' );

$this->assertArrayHasKey( 'name', $theme, 'Theme data must have a "name" key' );
$this->assertNotEmpty( $theme['name'], 'Theme name cannot be empty' );

$this->assertArrayHasKey( 'blockTheme', $theme, 'Themes data must include information about blocks support' );
}
}
}