Index: /trunk/wp-admin/edit-attachment-rows.php =================================================================== --- /trunk/wp-admin/edit-attachment-rows.php (revision 11244) +++ /trunk/wp-admin/edit-attachment-rows.php (revision 11245) @@ -83,5 +83,5 @@ $actions['edit'] = '' . __('Edit') . ''; if ( current_user_can('delete_post', $post->ID) ) - $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; + $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; $actions['view'] = '' . __('View') . ''; $action_count = count($actions); Index: /trunk/wp-admin/edit-form-advanced.php =================================================================== --- /trunk/wp-admin/edit-form-advanced.php (revision 11244) +++ /trunk/wp-admin/edit-form-advanced.php (revision 11245) @@ -230,5 +230,5 @@ ID) ) { ?> -ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"> +ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"> Index: /trunk/wp-admin/edit-form-comment.php =================================================================== --- /trunk/wp-admin/edit-form-comment.php (revision 11244) +++ /trunk/wp-admin/edit-form-comment.php (revision 11245) @@ -70,5 +70,5 @@
'.print_r($this,1).''; - $start = js_escape( __('Import') ); - $continue = js_escape( __('Continue') ); - $stop = js_escape( __('Importing...') ); - $authors = js_escape( __('Set Authors') ); - $loadauth = js_escape( __('Preparing author mapping form...') ); - $authhead = js_escape( __('Final Step: Author Mapping') ); - $nothing = js_escape( __('Nothing was imported. Had you already imported this blog?') ); + $start = esc_js( __('Import') ); + $continue = esc_js( __('Continue') ); + $stop = esc_js( __('Importing...') ); + $authors = esc_js( __('Set Authors') ); + $loadauth = esc_js( __('Preparing author mapping form...') ); + $authhead = esc_js( __('Final Step: Author Mapping') ); + $nothing = esc_js( __('Nothing was imported. Had you already imported this blog?') ); $title = __('Blogger Blogs'); $name = __('Blog Name'); @@ -216,5 +216,5 @@ $value = $authors; $value = esc_attr($value); - $blogtitle = js_escape( $blog['title'] ); + $blogtitle = esc_js( $blog['title'] ); $pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0; $cdone = isset($blog['comments_done']) ? (int) $blog['comments_done'] : 0; @@ -659,5 +659,5 @@ $mapthis = __('Blogger username'); $tothis = __('WordPress login'); - $submit = js_escape( __('Save Changes') ); + $submit = esc_js( __('Save Changes') ); foreach ( $blog['authors'] as $i => $author ) Index: /trunk/wp-admin/includes/template.php =================================================================== --- /trunk/wp-admin/includes/template.php (revision 11244) +++ /trunk/wp-admin/includes/template.php (revision 11245) @@ -1447,5 +1447,5 @@ $actions['edit'] = '' . __('Edit') . ''; $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; - $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; + $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; } if ( in_array($post->post_status, array('pending', 'draft')) ) { @@ -1660,5 +1660,5 @@ $actions['edit'] = '' . __('Edit') . ''; $actions['inline'] = '' . __('Quick Edit') . ''; - $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; + $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; } if ( in_array($post->post_status, array('pending', 'draft')) ) { Index: /trunk/wp-admin/link-manager.php =================================================================== --- /trunk/wp-admin/link-manager.php (revision 11244) +++ /trunk/wp-admin/link-manager.php (revision 11245) @@ -198,5 +198,5 @@ $actions = array(); $actions['edit'] = '' . __('Edit') . ''; - $actions['delete'] = "link_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf( __("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete') . ""; + $actions['delete'] = "link_id) . "' onclick=\"if ( confirm('" . esc_js(sprintf( __("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete') . ""; $action_count = count($actions); $i = 0; Index: /trunk/wp-admin/press-this.php =================================================================== --- /trunk/wp-admin/press-this.php (revision 11244) +++ /trunk/wp-admin/press-this.php (revision 11245) @@ -403,5 +403,5 @@ break; case 'photo' : - jQuery('#extra_fields').before('
'); + jQuery('#extra_fields').before('
'); jQuery.ajax({ type: "GET", Index: /trunk/wp-admin/themes.php =================================================================== --- /trunk/wp-admin/themes.php (revision 11244) +++ /trunk/wp-admin/themes.php (revision 11245) @@ -198,5 +198,5 @@ $actions[] = '' . __('Preview') . ''; if ( current_user_can('update_themes') ) - $actions[] = '' . __('Delete') . ''; + $actions[] = '' . __('Delete') . ''; $actions = apply_filters('theme_action_links', $actions, $themes[$theme_name]); Index: /trunk/wp-admin/update-core.php =================================================================== --- /trunk/wp-admin/update-core.php (revision 11244) +++ /trunk/wp-admin/update-core.php (revision 11245) @@ -59,6 +59,6 @@ if ( $dismissed ) { - $show_text = js_escape(__('Show hidden updates')); - $hide_text = js_escape(__('Hide hidden updates')); + $show_text = esc_js(__('Show hidden updates')); + $hide_text = esc_js(__('Hide hidden updates')); ?>