From 16bb82eb760f71863729de81b74a27c6cf053736 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sun, 28 Aug 2016 18:05:02 +0000
Subject: [PATCH] I18N: Correct various instances of incorrect usage of
`esc_attr_e()`.
Fixes #37457
Props henry.wright, afercia
git-svn-id: https://develop.svn.wordpress.org/trunk@38424 602fd350-edb4-49c9-b593-d223f7449a82
---
src/wp-admin/comment.php | 4 +-
src/wp-admin/includes/revision.php | 4 +-
src/wp-admin/setup-config.php | 2 +-
src/wp-admin/theme-editor.php | 2 +-
src/wp-includes/media-template.php | 60 +++++++++++++++---------------
src/wp-login.php | 2 +-
6 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/wp-admin/comment.php b/src/wp-admin/comment.php
index aa2e054361..00ebcd9d82 100644
--- a/src/wp-admin/comment.php
+++ b/src/wp-admin/comment.php
@@ -213,7 +213,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
<td class="comment-content">
<?php comment_text( $comment ); ?>
- <p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&c={$comment->comment_ID}" ); ?>"><?php esc_attr_e( 'Edit' ); ?></a></p>
+ <p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
</td>
</tr>
</table>
@@ -222,7 +222,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
<p>
<?php submit_button( $button, 'primary', 'submit', false ); ?>
- <a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e( 'Cancel' ); ?></a>
+ <a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
</p>
<?php wp_nonce_field( $nonce_action ); ?>
diff --git a/src/wp-admin/includes/revision.php b/src/wp-admin/includes/revision.php
index dfef883f9e..9edf52d2a0 100644
--- a/src/wp-admin/includes/revision.php
+++ b/src/wp-admin/includes/revision.php
@@ -340,7 +340,7 @@ function wp_print_revision_templates() {
}
#>
/>
- <?php esc_attr_e( 'Compare any two revisions' ); ?>
+ <?php esc_html_e( 'Compare any two revisions' ); ?>
</label>
</div>
</script>
@@ -400,4 +400,4 @@ function wp_print_revision_templates() {
<# }); #>
</div>
</script><?php
-}
\ No newline at end of file
+}
diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php
index 1ad40fcb6a..6c65bf8092 100644
--- a/src/wp-admin/setup-config.php
+++ b/src/wp-admin/setup-config.php
@@ -101,7 +101,7 @@ function setup_config_display_header( $body_classes = array() ) {
<?php wp_admin_css( 'install', true ); ?>
</head>
<body class="<?php echo implode( ' ', $body_classes ); ?>">
-<p id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
<?php
} // end function setup_config_display_header();
diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php
index 9fb2c41e47..d6c492fc0f 100644
--- a/src/wp-admin/theme-editor.php
+++ b/src/wp-admin/theme-editor.php
@@ -263,7 +263,7 @@ else : ?>
<div id="documentation" class="hide-if-no-js">
<label for="docs-list"><?php _e('Documentation:') ?></label>
<?php echo $docs_select; ?>
- <input type="button" class="button" value=" <?php esc_attr_e( 'Look Up' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( $wp_version ) ?>&redirect=true'); }" />
+ <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( $wp_version ) ?>&redirect=true'); }" />
</div>
<?php endif; ?>
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 7d2d2bf48b..c6699216e9 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -610,16 +610,16 @@ function wp_print_media_templates() {
<# } #>>
<option value="left">
- <?php esc_attr_e('Left'); ?>
+ <?php esc_html_e( 'Left' ); ?>
</option>
<option value="center">
- <?php esc_attr_e('Center'); ?>
+ <?php esc_html_e( 'Center' ); ?>
</option>
<option value="right">
- <?php esc_attr_e('Right'); ?>
+ <?php esc_html_e( 'Right' ); ?>
</option>
<option value="none" selected>
- <?php esc_attr_e('None'); ?>
+ <?php esc_html_e( 'None' ); ?>
</option>
</select>
</label>
@@ -641,31 +641,31 @@ function wp_print_media_templates() {
<# if ( data.model.canEmbed ) { #>
<option value="embed" selected>
- <?php esc_attr_e('Embed Media Player'); ?>
+ <?php esc_html_e( 'Embed Media Player' ); ?>
</option>
<option value="file">
<# } else { #>
<option value="none" selected>
- <?php esc_attr_e('None'); ?>
+ <?php esc_html_e( 'None' ); ?>
</option>
<option value="file">
<# } #>
<# if ( data.model.canEmbed ) { #>
- <?php esc_attr_e('Link to Media File'); ?>
+ <?php esc_html_e( 'Link to Media File' ); ?>
<# } else { #>
- <?php esc_attr_e('Media File'); ?>
+ <?php esc_html_e( 'Media File' ); ?>
<# } #>
</option>
<option value="post">
<# if ( data.model.canEmbed ) { #>
- <?php esc_attr_e('Link to Attachment Page'); ?>
+ <?php esc_html_e( 'Link to Attachment Page' ); ?>
<# } else { #>
- <?php esc_attr_e('Attachment Page'); ?>
+ <?php esc_html_e( 'Attachment Page' ); ?>
<# } #>
</option>
<# if ( 'image' === data.type ) { #>
<option value="custom">
- <?php esc_attr_e('Custom URL'); ?>
+ <?php esc_html_e( 'Custom URL' ); ?>
</option>
<# } #>
</select>
@@ -718,13 +718,13 @@ function wp_print_media_templates() {
<option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' == wp.media.galleryDefaults.link ) {
#>selected="selected"<# }
#>>
- <?php esc_attr_e('Attachment Page'); ?>
+ <?php esc_html_e( 'Attachment Page' ); ?>
</option>
<option value="file" <# if ( 'file' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
- <?php esc_attr_e('Media File'); ?>
+ <?php esc_html_e( 'Media File' ); ?>
</option>
<option value="none" <# if ( 'none' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
- <?php esc_attr_e('None'); ?>
+ <?php esc_html_e( 'None' ); ?>
</option>
</select>
</label>
@@ -841,16 +841,16 @@ function wp_print_media_templates() {
<span><?php _e('Align'); ?></span>
<div class="button-group button-large" data-setting="align">
<button class="button" value="left">
- <?php esc_attr_e('Left'); ?>
+ <?php esc_html_e( 'Left' ); ?>
</button>
<button class="button" value="center">
- <?php esc_attr_e('Center'); ?>
+ <?php esc_html_e( 'Center' ); ?>
</button>
<button class="button" value="right">
- <?php esc_attr_e('Right'); ?>
+ <?php esc_html_e( 'Right' ); ?>
</button>
<button class="button active" value="none">
- <?php esc_attr_e('None'); ?>
+ <?php esc_html_e( 'None' ); ?>
</button>
</div>
</div>
@@ -859,13 +859,13 @@ function wp_print_media_templates() {
<span><?php _e('Link To'); ?></span>
<div class="button-group button-large" data-setting="link">
<button class="button" value="file">
- <?php esc_attr_e('Image URL'); ?>
+ <?php esc_html_e( 'Image URL' ); ?>
</button>
<button class="button" value="custom">
- <?php esc_attr_e('Custom URL'); ?>
+ <?php esc_html_e( 'Custom URL' ); ?>
</button>
<button class="button active" value="none">
- <?php esc_attr_e('None'); ?>
+ <?php esc_html_e( 'None' ); ?>
</button>
</div>
<input type="text" class="link-to-custom" data-setting="linkUrl" />
@@ -907,16 +907,16 @@ function wp_print_media_templates() {
<span><?php _e('Align'); ?></span>
<div class="button-group button-large" data-setting="align">
<button class="button" value="left">
- <?php esc_attr_e('Left'); ?>
+ <?php esc_html_e( 'Left' ); ?>
</button>
<button class="button" value="center">
- <?php esc_attr_e('Center'); ?>
+ <?php esc_html_e( 'Center' ); ?>
</button>
<button class="button" value="right">
- <?php esc_attr_e('Right'); ?>
+ <?php esc_html_e( 'Right' ); ?>
</button>
<button class="button active" value="none">
- <?php esc_attr_e('None'); ?>
+ <?php esc_html_e( 'None' ); ?>
</button>
</div>
</div>
@@ -964,21 +964,21 @@ function wp_print_media_templates() {
<select data-setting="link">
<# if ( data.attachment ) { #>
<option value="file">
- <?php esc_attr_e('Media File'); ?>
+ <?php esc_html_e( 'Media File' ); ?>
</option>
<option value="post">
- <?php esc_attr_e('Attachment Page'); ?>
+ <?php esc_html_e( 'Attachment Page' ); ?>
</option>
<# } else { #>
<option value="file">
- <?php esc_attr_e('Image URL'); ?>
+ <?php esc_html_e( 'Image URL' ); ?>
</option>
<# } #>
<option value="custom">
- <?php esc_attr_e('Custom URL'); ?>
+ <?php esc_html_e( 'Custom URL' ); ?>
</option>
<option value="none">
- <?php esc_attr_e('None'); ?>
+ <?php esc_html_e( 'None' ); ?>
</option>
</select>
<input type="text" class="link-to-custom" data-setting="linkUrl" />
diff --git a/src/wp-login.php b/src/wp-login.php
index 409342d761..1764d46f0c 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -912,7 +912,7 @@ default:
*/
do_action( 'login_form' );
?>
- <p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
+ <p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_html_e( 'Remember Me' ); ?></label></p>
<p class="submit">
<input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Log In'); ?>" />
<?php if ( $interim_login ) { ?>