diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 411954f45c..e51f89c273 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -95,7 +95,7 @@ if ( function_exists('mb_strlen') ) {
}
?>
-
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 9df8117fce..67136dd329 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -360,8 +360,8 @@ if ( $is_trash && current_user_can($post_type_object->edit_others_cap) ) { ?>
diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php
index b2f7936ca0..981fab65da 100644
--- a/wp-admin/import/livejournal.php
+++ b/wp-admin/import/livejournal.php
@@ -968,7 +968,7 @@ class LJ_API_Import {
if ( next_counter <= 0 ) {
if ( jQuery( '#' ).length ) {
jQuery( "# input[type='submit']" ).hide();
- str = '
';
+ str = '
';
jQuery( '#' ).html( str );
jQuery( '#' ).submit();
return;
@@ -997,7 +997,7 @@ class LJ_API_Import {
if ( jQuery( '#' ).length ) {
jQuery( "# input[type='submit']" ).hide();
jQuery.ajaxSetup({'timeout':3600000});
- str = '
';
+ str = '
';
jQuery( '#' ).html( str );
jQuery('#ljapi-status').load(ajaxurl, {'action':'lj-importer',
'step':jQuery('#step').val(),
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 7b2699130a..e83c55b1b3 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -424,7 +424,7 @@ function wp_dashboard_quick_press() {
-
+
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 747898a473..7250086d10 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -376,12 +376,12 @@ function media_buttons() {
$out = '';
if ( $do_image )
- $out .= "
";
+ $out .= "
";
if ( $do_video )
- $out .= "
";
+ $out .= "
";
if ( $do_audio )
- $out .= "
";
- $out .= "
";
+ $out .= "
";
+ $out .= "
";
printf($context, $out);
}
@@ -1214,7 +1214,7 @@ function get_media_item( $attachment_id, $args = null ) {
$image_edit_button = '';
if ( gd_edit_image_support( $post->post_mime_type ) ) {
$nonce = wp_create_nonce( "image_editor-$post->ID" );
- $image_edit_button = "
";
+ $image_edit_button = "
";
}
$attachment_url = get_permalink( $attachment_id );
@@ -1631,7 +1631,7 @@ var addExtImage = {
document.getElementById('go_button').style.color = '#bbb';
if ( ! document.forms[0].src.value )
document.getElementById('status_img').innerHTML = '*';
- else document.getElementById('status_img').innerHTML = '
';
+ else document.getElementById('status_img').innerHTML = '
';
},
updateImageData : function() {
@@ -1640,7 +1640,7 @@ var addExtImage = {
t.width = t.preloadImg.width;
t.height = t.preloadImg.height;
document.getElementById('go_button').style.color = '#333';
- document.getElementById('status_img').innerHTML = '
';
+ document.getElementById('status_img').innerHTML = '
';
},
getImageData : function() {
@@ -1650,7 +1650,7 @@ var addExtImage = {
t.resetImageData();
return false;
}
- document.getElementById('status_img').innerHTML = '
';
+ document.getElementById('status_img').innerHTML = '
';
t.preloadImg = new Image();
t.preloadImg.onload = t.updateImageData;
t.preloadImg.onerror = t.resetImageData;
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 483de415bf..95cdcab566 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -207,7 +207,7 @@ if ( current_user_can( "delete_${type_cap}", $post->ID ) ) {
-
+
post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
if ( $can_publish ) :
@@ -432,7 +432,7 @@ function post_comment_meta_box($post) {
-
+
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 97b982aafa..5e3eb5668f 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -821,7 +821,7 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
add_action( $hookname, $function );
if ( empty($icon_url) ) {
- $icon_url = 'images/generic.png';
+ $icon_url = esc_url( admin_url( 'images/generic.png' ) );
} elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') ) {
$icon_url = 'https://' . substr($icon_url, 7);
}
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 6710c7e131..11cca710bc 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -65,7 +65,7 @@ function inline_edit_term_row($type, $taxonomy) {
-
+
@@ -671,7 +671,7 @@ function wp_manage_posts_columns( $screen = '') {
$posts_columns['tags'] = __('Tags');
$post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
- $posts_columns['comments'] = '
';
+ $posts_columns['comments'] = '
';
$posts_columns['date'] = __('Date');
// @todo filter per type
$posts_columns = apply_filters('manage_posts_columns', $posts_columns);
@@ -697,7 +697,7 @@ function wp_manage_media_columns() {
//$posts_columns['tags'] = _x('Tags', 'column name');
/* translators: column name */
$posts_columns['parent'] = _x('Attached to', 'column name');
- $posts_columns['comments'] = '
';
+ $posts_columns['comments'] = '
';
//$posts_columns['comments'] = __('Comments');
/* translators: column name */
$posts_columns['date'] = _x('Date', 'column name');
@@ -1165,7 +1165,7 @@ function inline_edit_row( $screen ) {
$update_text = __( 'Update' );
?>
-
+
@@ -2276,7 +2276,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
-
+
@@ -2611,7 +2611,7 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
function browse_happy() {
$getit = __( 'WordPress recommends a better browser' );
echo '
-
+
';
}
diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index dbc14f12e7..aef0dbafae 100644
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -202,7 +202,7 @@ function wp_widget_control( $sidebar_args ) {
diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index 951519c827..e15d27591e 100644
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -412,7 +412,7 @@ switch ( $_GET['action'] ) {
-
+
@@ -547,11 +547,11 @@ var photostorage = false;