Changeset 29961

Timestamp:

10/18/2014 08:10:47 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Use proper functions for escaped translations.

pros jcastaneda.
fixes #30012.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (1 diff)
• wp-admin/themes.php (modified) (1 diff)
• wp-includes/default-widgets.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-posts-list-table.php

@@ -665 +665 @@
                 $actions = array();
                 if ( $can_edit_post && 'trash' != $post->post_status ) {
-                    $actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ) ) . '">' . __( 'Edit' ) . '</a>';
-                    $actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr( __( 'Edit this item inline' ) ) . '">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+                    $actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr__( 'Edit this item' ) . '">' . __( 'Edit' ) . '</a>';
+                    $actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr__( 'Edit this item inline' ) . '">' . __( 'Quick&nbsp;Edit' ) . '</a>';
                 }
                 if ( current_user_can( 'delete_post', $post->ID ) ) {
                     if ( 'trash' == $post->post_status )
-                        $actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash' ) ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
+                        $actions['untrash'] = "<a title='" . esc_attr__( 'Restore this item from the Trash' ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
                     elseif ( EMPTY_TRASH_DAYS )
-                        $actions['trash'] = "<a class='submitdelete' title='" . esc_attr( __( 'Move this item to the Trash' ) ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+                        $actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash' ) . "' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
                     if ( 'trash' == $post->post_status || !EMPTY_TRASH_DAYS )
-                        $actions['delete'] = "<a class='submitdelete' title='" . esc_attr( __( 'Delete this item permanently' ) ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+                        $actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently' ) . "' href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
                 }
                 if ( $post_type_object->public ) {

trunk/src/wp-admin/press-this.php

@@ -150 +150 @@
 
             <p class="centered">
-                <input type="hidden" name="this_photo" value="<?php echo esc_attr($image); ?>" id="tb_this_photo" class="tb_this_photo" />
+                <input type="hidden" name="this_photo" value="<?php echo esc_attr( $image ); ?>" id="tb_this_photo" class="tb_this_photo" />
                 <a href="#" class="select">
-                    <img src="<?php echo esc_url($image); ?>" alt="<?php echo esc_attr(__('Click to insert.')); ?>" title="<?php echo esc_attr(__('Click to insert.')); ?>" />
+                    <img src="<?php echo esc_url( $image ); ?>" alt="<?php esc_attr_e( 'Click to insert.' ); ?>" title="<?php esc_attr_e( 'Click to insert.' ); ?>" />
                 </a>
             </p>

trunk/src/wp-admin/themes.php

@@ -120 +120 @@
         <span class="title-count theme-count"><?php echo count( $themes ); ?></span>
     <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
-        <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js add-new-h2"><?php echo esc_html( _x( 'Add New', 'Add new theme' ) ); ?></a>
+        <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js add-new-h2"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
     <?php endif; ?>
     </h2>

trunk/src/wp-includes/default-widgets.php

@@ -288 +288 @@
 ?>
         <select name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
-            <option value=""><?php echo esc_attr( __( 'Select Month' ) ); ?></option>
+            <option value=""><?php esc_attr_e( 'Select Month' ); ?></option>
 
             <?php

trunk/src/wp-includes/script-loader.php

@@ -87 +87 @@
     $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
     did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
-        'closeAllOpenTags' => esc_attr(__('Close all open tags')),
-        'closeTags' => esc_attr(__('close tags')),
-        'enterURL' => __('Enter the URL'),
-        'enterImageURL' => __('Enter the URL of the image'),
-        'enterImageDescription' => __('Enter a description of the image'),
-        'fullscreen' => __('fullscreen'),
-        'toggleFullscreen' => esc_attr( __('Toggle fullscreen mode') ),
-        'textdirection' => esc_attr( __('text direction') ),
-        'toggleTextdirection' => esc_attr( __('Toggle Editor Text Direction') )
+        'closeAllOpenTags'      => esc_attr__( 'Close all open tags' ),
+        'closeTags'             => esc_attr__( 'close tags' ),
+        'enterURL'              => __( 'Enter the URL' ),
+        'enterImageURL'         => __( 'Enter the URL of the image' ),
+        'enterImageDescription' => __( 'Enter a description of the image' ),
+        'fullscreen'            => __( 'fullscreen' ),
+        'toggleFullscreen'      => esc_attr__( 'Toggle fullscreen mode' ),
+        'textdirection'         => esc_attr__( 'text direction' ),
+        'toggleTextdirection'   => esc_attr__( 'Toggle Editor Text Direction' )
     ) );