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

Coding Standards: Consistently escape URLs in `wp-admin/themes.php`. 

Includes:
* Wrapping long lines for better readability.
* Bringing some consistency to the placement of `href` and `aria-label` attributes.
* Adding missing `aria-label` attributes for Live Preview links.

Follow-up to [26726], [52020], [51083].

Props patelketan, sainathpoojary, SergeyBiryukov.
Fixes #62405.
Built from https://develop.svn.wordpress.org/trunk@59400


git-svn-id: http://core.svn.wordpress.org/trunk@58786 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-11-13 12:27:12 +00:00
parent 8f5eb7a835
commit a20a5a4516
2 changed files with 96 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
wp-admin/themes.php
View File

@ -583,7 +583,9 @@ foreach ( $themes as $theme ) :
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$details_aria_label = sprintf( _x( 'View Theme Details for %s', 'theme' ), $theme['name'] ); $details_aria_label = sprintf( _x( 'View Theme Details for %s', 'theme' ), $theme['name'] );
?> ?>
<button type="button" aria-label="<?php echo esc_attr( $details_aria_label ); ?>" class="more-details" id="<?php echo esc_attr( $aria_action ); ?>"><?php _e( 'Theme Details' ); ?></button> <button type="button" class="more-details" id="<?php echo esc_attr( $aria_action ); ?>"
aria-label="<?php echo esc_attr( $details_aria_label ); ?>"
><?php _e( 'Theme Details' ); ?></button>
<div class="theme-author"> <div class="theme-author">
<?php <?php
/* translators: %s: Theme author name. */ /* translators: %s: Theme author name. */
@ -607,30 +609,49 @@ foreach ( $themes as $theme ) :
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$customize_aria_label = sprintf( _x( 'Customize %s', 'theme' ), $theme['name'] ); $customize_aria_label = sprintf( _x( 'Customize %s', 'theme' ), $theme['name'] );
?> ?>
<a aria-label="<?php echo esc_attr( $customize_aria_label ); ?>" class="button button-primary customize load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Customize' ); ?></a> <a class="button button-primary customize load-customize hide-if-no-customize"
href="<?php echo esc_url( $theme['actions']['customize'] ); ?>"
aria-label="<?php echo esc_attr( $customize_aria_label ); ?>"
><?php _e( 'Customize' ); ?></a>
<?php } ?> <?php } ?>
<?php } elseif ( $theme['compatibleWP'] && $theme['compatiblePHP'] ) { ?> <?php } elseif ( $theme['compatibleWP'] && $theme['compatiblePHP'] ) { ?>
<?php <?php
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' ); $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
?> ?>
<a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a> <a class="button activate"
href="<?php echo esc_url( $theme['actions']['activate'] ); ?>"
aria-label="<?php echo esc_attr( $aria_label ); ?>"
><?php _e( 'Activate' ); ?></a>
<?php <?php
// Only classic themes require the "customize" capability. // Only classic themes require the "customize" capability.
if ( current_user_can( 'edit_theme_options' ) && ( $theme['blockTheme'] || current_user_can( 'customize' ) ) ) { if ( current_user_can( 'edit_theme_options' ) && ( $theme['blockTheme'] || current_user_can( 'customize' ) ) ) {
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' ); $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
?> ?>
<a aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>" class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a> <a class="button button-primary load-customize hide-if-no-customize"
href="<?php echo esc_url( $theme['actions']['customize'] ); ?>"
aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
><?php _e( 'Live Preview' ); ?></a>
<?php } ?> <?php } ?>
<?php } else { ?> <?php } else { ?>
<?php <?php
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Cannot Activate %s', 'theme' ), '{{ data.name }}' ); $aria_label = sprintf( _x( 'Cannot Activate %s', 'theme' ), '{{ data.name }}' );
?> ?>
<a class="button disabled" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Activate', 'theme' ); ?></a> <a class="button disabled"
<?php if ( ! $theme['blockTheme'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?> aria-label="<?php echo esc_attr( $aria_label ); ?>"
<a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a> ><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
<?php
if ( ! $theme['blockTheme'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
/* translators: %s: Theme name. */
$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
?>
<a class="button button-primary hide-if-no-customize disabled"
aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
><?php _e( 'Live Preview' ); ?></a>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
@ -954,7 +975,9 @@ function wp_theme_auto_update_setting_template() {
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$details_aria_label = sprintf( _x( 'View Theme Details for %s', 'theme' ), '{{ data.name }}' ); $details_aria_label = sprintf( _x( 'View Theme Details for %s', 'theme' ), '{{ data.name }}' );
?> ?>
<button type="button" aria-label="<?php echo esc_attr( $details_aria_label ); ?>" class="more-details" id="{{ data.id }}-action"><?php _e( 'Theme Details' ); ?></button> <button type="button" class="more-details" id="{{ data.id }}-action"
aria-label="<?php echo esc_attr( $details_aria_label ); ?>"
><?php _e( 'Theme Details' ); ?></button>
<div class="theme-author"> <div class="theme-author">
<?php <?php
/* translators: %s: Theme author name. */ /* translators: %s: Theme author name. */
@ -978,7 +1001,10 @@ function wp_theme_auto_update_setting_template() {
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$customize_aria_label = sprintf( _x( 'Customize %s', 'theme' ), '{{ data.name }}' ); $customize_aria_label = sprintf( _x( 'Customize %s', 'theme' ), '{{ data.name }}' );
?> ?>
<a aria-label="<?php echo esc_attr( $customize_aria_label ); ?>" class="button button-primary customize load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Customize' ); ?></a> <a class="button button-primary customize load-customize hide-if-no-customize"
href="{{{ data.actions.customize }}}"
aria-label="<?php echo esc_attr( $customize_aria_label ); ?>"
><?php _e( 'Customize' ); ?></a>
<# } #> <# } #>
<# } else { #> <# } else { #>
<# if ( data.compatibleWP && data.compatiblePHP ) { #> <# if ( data.compatibleWP && data.compatiblePHP ) { #>
@ -986,20 +1012,36 @@ function wp_theme_auto_update_setting_template() {
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' ); $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
?> ?>
<a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a> <a class="button activate"
href="{{{ data.actions.activate }}}"
aria-label="<?php echo esc_attr( $aria_label ); ?>"
><?php _e( 'Activate' ); ?></a>
<?php <?php
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' ); $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
?> ?>
<a aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>" class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a> <a class="button button-primary load-customize hide-if-no-customize"
href="{{{ data.actions.customize }}}"
aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
><?php _e( 'Live Preview' ); ?></a>
<# } else { #> <# } else { #>
<?php <?php
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Cannot Activate %s', 'theme' ), '{{ data.name }}' ); $aria_label = sprintf( _x( 'Cannot Activate %s', 'theme' ), '{{ data.name }}' );
?> ?>
<a class="button disabled" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Activate', 'theme' ); ?></a> <a class="button disabled"
aria-label="<?php echo esc_attr( $aria_label ); ?>"
><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
<# if ( ! data.blockTheme ) { #> <# if ( ! data.blockTheme ) { #>
<a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a> <?php
/* translators: %s: Theme name. */
$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
?>
<a class="button button-primary hide-if-no-customize disabled"
aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
><?php _e( 'Live Preview' ); ?></a>
<# } #> <# } #>
<# } #> <# } #>
<# } #> <# } #>
@ -1211,31 +1253,54 @@ function wp_theme_auto_update_setting_template() {
<div class="theme-actions"> <div class="theme-actions">
<div class="active-theme"> <div class="active-theme">
<a href="{{{ data.actions.customize }}}" class="button button-primary customize load-customize hide-if-no-customize"><?php _e( 'Customize' ); ?></a> <a class="button button-primary customize load-customize hide-if-no-customize"
href="{{{ data.actions.customize }}}"
><?php _e( 'Customize' ); ?></a>
<?php echo implode( ' ', $current_theme_actions ); ?> <?php echo implode( ' ', $current_theme_actions ); ?>
</div> </div>
<div class="inactive-theme"> <div class="inactive-theme">
<# if ( data.compatibleWP && data.compatiblePHP ) { #> <# if ( data.compatibleWP && data.compatiblePHP ) { #>
<# if ( ! data.blockTheme ) { #>
<?php
/* translators: %s: Theme name. */
$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
?>
<a class="button button-primary load-customize hide-if-no-customize"
href="{{{ data.actions.customize }}}"
aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
><?php _e( 'Live Preview' ); ?></a>
<# } #>
<# if ( data.actions.activate ) { #>
<?php <?php
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' ); $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
?> ?>
<# if ( ! data.blockTheme ) { #> <a class="button activate"
<a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a> href="{{{ data.actions.activate }}}"
<# } #> aria-label="<?php echo esc_attr( $aria_label ); ?>"
<# if ( data.actions.activate ) { #> ><?php _e( 'Activate' ); ?></a>
<a href="{{{ data.actions.activate }}}" class="button activate" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
<# } #> <# } #>
<# } else { #> <# } else { #>
<# if ( ! data.blockTheme ) { #>
<?php
/* translators: %s: Theme name. */
$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
?>
<a class="button button-primary hide-if-no-customize disabled"
aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
><?php _e( 'Live Preview' ); ?></a>
<# } #>
<# if ( data.actions.activate ) { #>
<?php <?php
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Cannot Activate %s', 'theme' ), '{{ data.name }}' ); $aria_label = sprintf( _x( 'Cannot Activate %s', 'theme' ), '{{ data.name }}' );
?> ?>
<# if ( ! data.blockTheme ) { #> <a class="button disabled"
<a class="button button-primary hide-if-no-customize disabled"><?php _e( 'Live Preview' ); ?></a> aria-label="<?php echo esc_attr( $aria_label ); ?>"
<# } #> ><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
<# if ( data.actions.activate ) { #>
<a class="button disabled" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
<# } #> <# } #>
<# } #> <# } #>
</div> </div>
@ -1245,7 +1310,10 @@ function wp_theme_auto_update_setting_template() {
/* translators: %s: Theme name. */ /* translators: %s: Theme name. */
$aria_label = sprintf( _x( 'Delete %s', 'theme' ), '{{ data.name }}' ); $aria_label = sprintf( _x( 'Delete %s', 'theme' ), '{{ data.name }}' );
?> ?>
<a href="{{{ data.actions['delete'] }}}" class="button delete-theme" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Delete' ); ?></a> <a class="button delete-theme"
href="{{{ data.actions['delete'] }}}"
aria-label="<?php echo esc_attr( $aria_label ); ?>"
><?php _e( 'Delete' ); ?></a>
<# } #> <# } #>
</div> </div>
</div> </div>

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.8-alpha-59399'; $wp_version = '6.8-alpha-59400';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.