diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php
index e80634a7d..9101bed6d 100644
--- a/wp-admin/import/blogger.php
+++ b/wp-admin/import/blogger.php
@@ -51,7 +51,7 @@ class Blogger_Import {
$welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
$prereqs = __('To use this importer, you must have a Google account and an upgraded (New, was Beta) blog hosted on blogspot.com or a custom domain (not FTP).');
$stepone = __('The first thing you need to do is tell Blogger to let WordPress access your account. You will be sent back here after providing authorization.');
- $auth = __('Authorize');
+ $auth = _a('Authorize');
echo "
@@ -214,6 +214,7 @@ class Blogger_Import {
$value = $continue;
else
$value = $authors;
+ $value = attr($value);
$blogtitle = js_escape( $blog['title'] );
$pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0;
$cdone = isset($blog['comments_done']) ? (int) $blog['comments_done'] : 0;
@@ -662,7 +663,7 @@ class Blogger_Import {
foreach ( $blog['authors'] as $i => $author )
$rows .= "
{$author[0]} " . $this->get_user_options($author[1]) . " ";
- return "
$heading $blogtitle $directions
";
+ return "
$heading $blogtitle $directions
";
}
function get_user_options($current) {
@@ -831,7 +832,7 @@ class Blogger_Import {
if ( $saved && !isset($_GET['noheader']) ) {
$restart = __('Restart');
$message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.');
- $submit = __('Clear account information');
+ $submit = _a('Clear account information');
echo "
";
}
}
diff --git a/wp-admin/import/btt.php b/wp-admin/import/btt.php
index a9d28319f..9224336aa 100644
--- a/wp-admin/import/btt.php
+++ b/wp-admin/import/btt.php
@@ -35,7 +35,7 @@ class BunnyTags_Import {
echo '
'.__('Don’t be stupid - backup your database before proceeding!').'
';
echo '
';
echo '
';
}
@@ -105,7 +105,7 @@ class BunnyTags_Import {
echo '';
echo '';
}
diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php
index 5d973bcb7..5655f8316 100644
--- a/wp-admin/import/dotclear.php
+++ b/wp-admin/import/dotclear.php
@@ -215,7 +215,7 @@ class Dotclear_Import {
echo '';
}
@@ -632,7 +632,7 @@ class Dotclear_Import {
echo '';
}
@@ -645,7 +645,7 @@ class Dotclear_Import {
echo '';
}
@@ -659,7 +659,7 @@ class Dotclear_Import {
echo '';
}
@@ -671,7 +671,7 @@ class Dotclear_Import {
echo '';
}
@@ -684,7 +684,7 @@ class Dotclear_Import {
echo '';
}
diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php
index 1370b7f99..2d54e139a 100644
--- a/wp-admin/import/greymatter.php
+++ b/wp-admin/import/greymatter.php
@@ -66,7 +66,7 @@ class GM_Import {
so you need to enter the number of the last GM post here. (if you don't know that number, just log into your FTP and look it out in the entries' folder)") ?>
-
+
footer();
diff --git a/wp-admin/import/jkw.php b/wp-admin/import/jkw.php
index 90cca2385..bf7e26993 100644
--- a/wp-admin/import/jkw.php
+++ b/wp-admin/import/jkw.php
@@ -34,11 +34,11 @@ class JeromesKeyword_Import {
echo ''.__('Don’t be stupid - backup your database before proceeding!').'
';
echo '';
echo '';
echo '';
}
@@ -120,7 +120,7 @@ class JeromesKeyword_Import {
echo '';
echo '';
}
@@ -153,7 +153,7 @@ class JeromesKeyword_Import {
}
echo '';
echo '';
}
diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php
index 7ca14eea6..55d244306 100644
--- a/wp-admin/import/livejournal.php
+++ b/wp-admin/import/livejournal.php
@@ -181,10 +181,10 @@ class LJ_API_Import {
auto_ajax( 'ljapi-auto-repost', 'auto-message', 0 ); ?>
approximately %d' ), get_option( 'ljapi_comment_batch' ), $batch ) ?>
-
+
auto_ajax( 'ljapi-auto-repost', 'auto-message', 0 ); ?>
';
$str .= wp_nonce_field( 'lj-api-import', '_wpnonce', true, false );
$str .= wp_referer_field( false );
- $str .= ' ';
+ $str .= ' ';
$str .= '
';
$str .= '';
diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php
index cef4f51d3..64a745405 100644
--- a/wp-admin/import/mt.php
+++ b/wp-admin/import/mt.php
@@ -46,7 +46,7 @@ class MT_Import {
mt-export.txt in your /wp-content/
directory'); ?>
-
+
out of memory error try splitting up the import file into pieces.'); ?>
@@ -207,12 +207,12 @@ class MT_Import {
$j = -1;
foreach ($authors as $author) {
++ $j;
- echo ''.__('Current author:').' '.$author.' '.sprintf(__('Create user %1$s or map to existing'), ' ');
+ echo ''.__('Current author:').' '.$author.' '.sprintf(__('Create user %1$s or map to existing'), ' ');
$this->users_form($j);
echo ' ';
}
- echo '
'.' ';
+ echo '
'.' ';
echo '';
echo '';
diff --git a/wp-admin/import/opml.php b/wp-admin/import/opml.php
index 5db24b81c..dc21793b8 100644
--- a/wp-admin/import/opml.php
+++ b/wp-admin/import/opml.php
@@ -64,7 +64,7 @@ foreach ($categories as $category) {
?>
-
+
diff --git a/wp-admin/import/stp.php b/wp-admin/import/stp.php
index 1fb40839f..3c007ebd6 100644
--- a/wp-admin/import/stp.php
+++ b/wp-admin/import/stp.php
@@ -33,7 +33,7 @@ class STP_Import {
echo ''.__('Don’t be stupid - backup your database before proceeding!').'
';
echo '';
echo '';
}
@@ -93,7 +93,7 @@ class STP_Import {
echo '';
echo '';
}
@@ -109,7 +109,7 @@ class STP_Import {
echo '' . sprintf( _n('Done! %s tag was added!', 'Done! %s tags were added!', $tags_added), $tags_added ) . '
';
echo '';
echo '';
}
diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php
index 0f8973e29..d9c9766d2 100644
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -70,7 +70,7 @@ class Textpattern_Import {
echo '';
echo '';
}
@@ -505,7 +505,7 @@ class Textpattern_Import {
echo '';
}
@@ -518,7 +518,7 @@ class Textpattern_Import {
echo '';
}
@@ -532,7 +532,7 @@ class Textpattern_Import {
echo '';
}
@@ -544,7 +544,7 @@ class Textpattern_Import {
echo '';
}
@@ -557,7 +557,7 @@ class Textpattern_Import {
echo '';
}
diff --git a/wp-admin/import/utw.php b/wp-admin/import/utw.php
index ef5f0866b..fa2aaa835 100644
--- a/wp-admin/import/utw.php
+++ b/wp-admin/import/utw.php
@@ -33,7 +33,7 @@ class UTW_Import {
echo ''.__('To accommodate larger databases for those tag-crazy authors out there, we have made this into an easy 5-step program to help you kick that nasty UTW habit. Just keep clicking along and we will let you know when you are in the clear!').'
';
echo ''.__('Don’t be stupid - backup your database before proceeding!').'
';
echo '';
echo '';
}
@@ -120,7 +120,7 @@ class UTW_Import {
echo '';
echo '';
}
@@ -156,7 +156,7 @@ class UTW_Import {
echo '';
echo '';
@@ -175,7 +175,7 @@ class UTW_Import {
echo '';
echo '';
diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php
index 521fe85e6..69334b339 100644
--- a/wp-admin/import/wordpress.php
+++ b/wp-admin/import/wordpress.php
@@ -233,7 +233,7 @@ class WP_Import {
}
echo '';
- echo ' '.' ';
+ echo ' '.' ';
echo '
';
echo '';
@@ -242,14 +242,14 @@ class WP_Import {
function users_form($n, $author) {
if ( $this->allow_create_users() ) {
- printf(''.__('Create user %1$s or map to existing'), ' ');
+ printf(''.__('Create user %1$s or map to existing'), ' ');
}
else {
echo __('Map to existing').' ';
}
// keep track of $n => $author name
- echo ' ';
+ echo ' ';
$users = get_users_of_blog();
?>
diff --git a/wp-admin/import/wp-cat2tag.php b/wp-admin/import/wp-cat2tag.php
index b6b59feb5..be37b0286 100644
--- a/wp-admin/import/wp-cat2tag.php
+++ b/wp-admin/import/wp-cat2tag.php
@@ -103,7 +103,7 @@ function check_all_rows() {
';
wp_dashboard_trigger_widget_control( $meta_box['id'] );
- echo "
";
+ echo "
";
echo '';
}
@@ -413,12 +413,12 @@ function wp_dashboard_quick_press() {
-
-
+
+
-
+
-
+
diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index e546cda34..f00ce38b2 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -773,7 +773,7 @@ jQuery(function($){
-
+
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 4ad21ebdd..b4ceb9243 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -751,7 +751,7 @@ function image_align_input_fields($post, $checked='') {
$out = array();
foreach ($alignments as $name => $label) {
-
+ $name = attr($name);
$out[] = "" . $label . " ";
@@ -1156,7 +1156,7 @@ function get_media_item( $attachment_id, $args = null ) {
$delete_href = wp_nonce_url("post.php?action=delete-post&post=$attachment_id", 'delete-post_' . $attachment_id);
if ( $send )
- $send = " ";
+ $send = " ";
if ( $delete )
$delete = "" . __('Delete') . " ";
if ( ( $send || $delete ) && !isset($form_fields['buttons']) )
@@ -1413,7 +1413,7 @@ if ( $id ) {
}
?>
-
+
-
+
@@ -1663,8 +1663,8 @@ jQuery(function($){
-
-
+
+
@@ -1708,7 +1708,7 @@ function media_upload_library_form($errors) {
:
-
+
@@ -1825,7 +1825,7 @@ jQuery(function($){
-
+
@@ -1907,7 +1907,7 @@ function type_url_form_image() {
-
+
@@ -1943,7 +1943,7 @@ function type_url_form_audio() {
-
+
@@ -1978,7 +1978,7 @@ function type_url_form_video() {
-
+
@@ -2013,7 +2013,7 @@ function type_url_form_file() {
-
+
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 8c1a48792..e902dcf82 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -213,7 +213,7 @@ function install_plugins_upload( $page = 1 ) {
-
+
";
+ echo " ";
echo ' ';
wp_nonce_field("$option_group-options");
}
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index dd68b6704..aee24f797 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -2304,7 +2304,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
-
+
@@ -2436,8 +2436,8 @@ function _list_meta_row( $entry, &$count ) {
$r .= "\n\t\t" . __( 'Key' ) . " ";
$r .= "\n\t\t ";
- $r .= "\n\t\t
";
+ $r .= "class='delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta' tabindex='6' value='". _a( 'Delete' ) ."' />";
+ $r .= "\n\t\t ";
$r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
$r .= " ";
@@ -2486,7 +2486,7 @@ function meta_form() {
foreach ( $keys as $key ) {
$key = attr( $key );
- echo "\n$key ";
+ echo "\n$key ";
}
?>
@@ -2502,7 +2502,7 @@ function meta_form() {
-
+
@@ -2722,9 +2722,9 @@ function wp_dropdown_roles( $selected = false ) {
foreach( $editable_roles as $role => $details ) {
$name = translate_user_role($details['name'] );
if ( $selected == $role ) // Make default first in list
- $p = "\n\t$name ";
+ $p = "\n\t$name ";
else
- $r .= "\n\t$name ";
+ $r .= "\n\t$name ";
}
echo $p . $r;
}
@@ -2804,7 +2804,7 @@ function wp_import_upload_form( $action ) {
-
+
-
-
+
+
\n";
if ( !empty($per_page_label) )
$return .= "$per_page_label \n";
- $return .= " ";
- $return .= " ";
+ $return .= " ";
+ $return .= " ";
$return .= "\n";
return $return;
}
diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php
index 394f00c51..c6ebbca3a 100644
--- a/wp-admin/includes/theme-install.php
+++ b/wp-admin/includes/theme-install.php
@@ -159,7 +159,7 @@ function install_theme_search_form() {
>
-
+
-
+
+ class="button" value="" />
" . __('There are no options for this widget.') . "\n"; ?>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index 6f3b2ec5a..85ec8bd19 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -382,10 +382,12 @@ var ajaxurl = '';
$content = '';
if ( preg_match("/youtube\.com\/watch/i", $url) ) {
list($domain, $video_id) = split("v=", $url);
+ $video_id = attr($video_id);
$content = ' ';
} elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) {
list($domain, $video_id) = split(".com/", $url);
+ $video_id = attr($video_id);
$content = ' ';
if ( trim($selection) == '' )
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index b3a860788..722ff83a6 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -96,7 +96,7 @@ default:
$docs_select = '';
$docs_select .= '' . _a( 'Function Name...' ) . ' ';
foreach ( $functions as $function ) {
- $docs_select .= '' . htmlspecialchars( $function ) . '() ';
+ $docs_select .= '' . htmlspecialchars( $function ) . '() ';
}
$docs_select .= ' ';
}
diff --git a/wp-content/themes/classic/comments-popup.php b/wp-content/themes/classic/comments-popup.php
index e511f33c9..40ef005e3 100644
--- a/wp-content/themes/classic/comments-popup.php
+++ b/wp-content/themes/classic/comments-popup.php
@@ -67,17 +67,17 @@ if ( post_password_required($commentstatus) ) { // and it doesn't match the coo
'.$user_identity.''); ?>
-
+
-
+
-
+
URL"); ?>
@@ -91,7 +91,7 @@ if ( post_password_required($commentstatus) ) { // and it doesn't match the coo
" />
- " />
+ " />
ID); ?>
diff --git a/wp-content/themes/classic/comments.php b/wp-content/themes/classic/comments.php
index f8bd12a13..35b63268b 100644
--- a/wp-content/themes/classic/comments.php
+++ b/wp-content/themes/classic/comments.php
@@ -53,13 +53,13 @@ if ( post_password_required() ) : ?>
-
+
-
+
-
+
@@ -68,7 +68,7 @@ if ( post_password_required() ) : ?>
-
+
ID); ?>
diff --git a/wp-content/themes/classic/sidebar.php b/wp-content/themes/classic/sidebar.php
index 0c8a12eac..a44532731 100644
--- a/wp-content/themes/classic/sidebar.php
+++ b/wp-content/themes/classic/sidebar.php
@@ -18,7 +18,7 @@
diff --git a/wp-content/themes/default/comments-popup.php b/wp-content/themes/default/comments-popup.php
index 2ae66d3ff..95e63cc18 100644
--- a/wp-content/themes/default/comments-popup.php
+++ b/wp-content/themes/default/comments-popup.php
@@ -66,17 +66,17 @@ if ( post_password_required($post) ) { // and it doesn't match the cookie
Logged in as . Log out »
-
+
Name
-
+
E-mail
-
+
URL
diff --git a/wp-content/themes/default/comments.php b/wp-content/themes/default/comments.php
index 051b0ca17..49319a06b 100644
--- a/wp-content/themes/default/comments.php
+++ b/wp-content/themes/default/comments.php
@@ -68,13 +68,13 @@
- />
+
/>
Name
- />
+
/>
Mail (will not be published)
-
+
Website
diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index f6f31a503..498af4107 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -166,7 +166,7 @@ function kubrick_theme_page_head() {
kUpdate(ColorPicker_targetInput.id);
}
function PopupWindow_populate(contents) {
- contents += '
';
+ contents += '
';
this.contents = contents;
this.populated = false;
}
@@ -380,14 +380,14 @@ function kubrick_theme_page() {