diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-links-list-table.php index cf27dfe7e9..910d6c40c5 100644 --- a/wp-admin/includes/class-wp-links-list-table.php +++ b/wp-admin/includes/class-wp-links-list-table.php @@ -142,7 +142,7 @@ class WP_Links_List_Table extends WP_List_Table { echo ''; break; case 'url': - echo "link_name )."'>$short_url"; + echo "link_name ) )."'>$short_url"; break; case 'categories': ?>>is_network ) { if ( $is_active_for_network ) { if ( current_user_can( 'manage_network_plugins' ) ) - $actions['network_deactivate'] = '' . __('Network Deactivate') . ''; + $actions['network_deactivate'] = '' . __('Network Deactivate') . ''; } else { if ( current_user_can( 'manage_network_plugins' ) ) - $actions['network_activate'] = '' . __('Network Activate') . ''; + $actions['network_activate'] = '' . __('Network Activate') . ''; if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) - $actions['delete'] = '' . __('Delete') . ''; + $actions['delete'] = '' . __('Delete') . ''; } } else { if ( $is_active ) { - $actions['deactivate'] = '' . __('Deactivate') . ''; + $actions['deactivate'] = '' . __('Deactivate') . ''; } else { - $actions['activate'] = '' . __('Activate') . ''; + $actions['activate'] = '' . __('Activate') . ''; if ( ! is_multisite() && current_user_can('delete_plugins') ) - $actions['delete'] = '' . __('Delete') . ''; + $actions['delete'] = '' . __('Delete') . ''; } // end if $is_active } // end if $screen->is_network if ( ( ! is_multisite() || $screen->is_network ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) ) - $actions['edit'] = '' . __('Edit') . ''; + $actions['edit'] = '' . __('Edit') . ''; } // end if $context $prefix = $screen->is_network ? 'network_admin_' : ''; @@ -422,11 +422,11 @@ class WP_Plugins_List_Table extends WP_List_Table { if ( !empty( $plugin_data['Author'] ) ) { $author = $plugin_data['Author']; if ( !empty( $plugin_data['AuthorURI'] ) ) - $author = '' . $plugin_data['Author'] . ''; + $author = '' . $plugin_data['Author'] . ''; $plugin_meta[] = sprintf( __( 'By %s' ), $author ); } if ( ! empty( $plugin_data['PluginURI'] ) ) - $plugin_meta[] = '' . __( 'Visit plugin site' ) . ''; + $plugin_meta[] = '' . __( 'Visit plugin site' ) . ''; $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status ); echo implode( ' | ', $plugin_meta ); diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 6c74a46673..3b5ab9027d 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -1282,7 +1282,7 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { $install_actions['activate_plugin'] = '' . __('Activate Plugin') . ''; if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) { - $install_actions['network_activate'] = '' . __('Network Activate') . ''; + $install_actions['network_activate'] = '' . __('Network Activate') . ''; unset( $install_actions['activate_plugin'] ); } diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 68ced7c785..2312f9b2b5 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -280,7 +280,7 @@ class WP_Users_List_Table extends WP_List_Table { $r .= "$user_object->first_name $user_object->last_name"; break; case 'email': - $r .= "$email"; + $r .= "$email"; break; case 'role': $r .= "$role_name"; @@ -289,7 +289,7 @@ class WP_Users_List_Table extends WP_List_Table { $attributes = 'class="posts column-posts num"' . $style; $r .= ""; if ( $numposts > 0 ) { - $r .= ""; + $r .= ""; $r .= $numposts; $r .= ''; } else { diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index fc5ca47076..66d74e864b 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -677,15 +677,15 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" ); $delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" ); - $actions['approve'] = "" . __( 'Approve' ) . ''; - $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; - $actions['edit'] = "". __('Edit') . ''; - $actions['reply'] = '' . __('Reply') . ''; - $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; + $actions['approve'] = "" . __( 'Approve' ) . ''; + $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; + $actions['edit'] = "". __('Edit') . ''; + $actions['reply'] = '' . __('Reply') . ''; + $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; if ( !EMPTY_TRASH_DAYS ) $actions['delete'] = "" . __('Delete Permanently') . ''; else - $actions['trash'] = "" . _x('Trash', 'verb') . ''; + $actions['trash'] = "" . _x('Trash', 'verb') . ''; $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment ); diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 69856d991a..518d7c0533 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -133,12 +133,12 @@ function _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup = //Apply Markup if ( $markup ) { if ( ! empty($plugin_data['PluginURI']) && ! empty($plugin_data['Name']) ) - $plugin_data['Title'] = '' . $plugin_data['Name'] . ''; + $plugin_data['Title'] = '' . $plugin_data['Name'] . ''; else $plugin_data['Title'] = $plugin_data['Name']; if ( ! empty($plugin_data['AuthorURI']) && ! empty($plugin_data['Author']) ) - $plugin_data['Author'] = '' . $plugin_data['Author'] . ''; + $plugin_data['Author'] = '' . $plugin_data['Author'] . ''; $plugin_data['Description'] = wptexturize( $plugin_data['Description'] ); if ( ! empty($plugin_data['Author']) ) diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 7ae1c1b550..8a1e995fe0 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -953,7 +953,7 @@ function do_meta_boxes($page, $context, $object) { $style = ''; $hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : ''; echo '
' . "\n"; - echo '

'; + echo '

'; echo "

{$box['title']}

\n"; echo '
' . "\n"; call_user_func($box['callback'], $object, $box); diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index c8747ab4a1..234b776650 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -826,7 +826,7 @@ class Walker_Category extends Walker { $cat_name = apply_filters( 'list_cats', $cat_name, $category ); $link = 'description) ) - $link .= 'title="' . sprintf(__( 'View all posts filed under %s' ), $cat_name) . '"'; + $link .= 'title="' . esc_attr( sprintf(__( 'View all posts filed under %s' ), $cat_name) ) . '"'; else $link .= 'title="' . esc_attr( strip_tags( apply_filters( 'category_description', $category->description, $category ) ) ) . '"'; $link .= '>'; diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 1a8de8b8f1..d44716ff7f 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -1177,7 +1177,7 @@ function get_calendar($initial = true, $echo = true) { '; if ( $previous ) { - $calendar_output .= "\n\t\t".'« ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . ''; + $calendar_output .= "\n\t\t".'« ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . ''; } else { $calendar_output .= "\n\t\t".' '; } diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index 6d152ea7d6..87bfafb853 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -240,7 +240,7 @@ wp_admin_css( 'wp-admin', true );

()

-

by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '') ?>

+

by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '') ?>

Moxiecode Systems AB, All rights reserved.') ?>

TinyMCE website.') ?>

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 7893eb006e..a4dd3e1351 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -1010,7 +1010,7 @@ function edit_comment_link( $link = null, $before = '', $after = '' ) { if ( null === $link ) $link = __('Edit This'); - $link = '' . $link . ''; + $link = '' . $link . ''; echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after; } @@ -1051,7 +1051,7 @@ function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = if ( empty($link) ) $link = __('Edit This'); - $link = '' . $link . ''; + $link = '' . $link . ''; echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after; } diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 88d6cfaefc..51d8cd7922 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -239,7 +239,7 @@ function get_theme_data( $theme_file ) { if ( empty( $theme_data['AuthorURI'] ) ) { $theme_data['Author'] = $theme_data['AuthorName']; } else { - $theme_data['Author'] = sprintf( '%3$s', $theme_data['AuthorURI'], __( 'Visit author homepage' ), $theme_data['AuthorName'] ); + $theme_data['Author'] = sprintf( '%3$s', $theme_data['AuthorURI'], esc_attr__( 'Visit author homepage' ), $theme_data['AuthorName'] ); } } diff --git a/wp-login.php b/wp-login.php index f2be2c666b..e303ba5f1c 100644 --- a/wp-login.php +++ b/wp-login.php @@ -83,9 +83,9 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { -

+

-

+

-

+

@@ -661,7 +661,7 @@ default:

-

+