<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14374] trunk: Revert [14347] and [14372].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14374">14374</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-03 18:16:22 +0000 (Mon, 03 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/14347">[14347]</a> and <a href="http://trac.wordpress.org/changeset/14372">[14372]</a>. It broke more than we expected. Try again in 3.1. see <a href="http://trac.wordpress.org/ticket/13051">#13051</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminimportlivejournalphp">trunk/wp-admin/import/livejournal.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludeswidgetsphp">trunk/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunkwpadminjsrevisionsjsphp">trunk/wp-admin/js/revisions-js.php</a></li>
<li><a href="#trunkwpadminmsdeletesitephp">trunk/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
<li><a href="#trunkwpadminmysitesphp">trunk/wp-admin/my-sites.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/admin-header.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -105,9 +105,9 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<img id="header-logo" src="<?php echo includes_url( 'images/blank.gif' ); ?>" alt="" width="32" height="32" />
</del><ins>+<img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="32" height="32" />
</ins><span class="cx"> <h1 id="site-heading" <?php echo $title_class ?>>
</span><del>- <a href="<?php echo trailingslashit( home_url() ); ?>" title="<?php esc_attr_e('Visit Site') ?>">
</del><ins>+ <a href="<?php echo trailingslashit( get_bloginfo( 'url' ) ); ?>" title="<?php esc_attr_e('Visit Site') ?>">
</ins><span class="cx"> <span id="site-title"><?php echo $blog_name ?></span>
</span><span class="cx"> </a>
</span><span class="cx"> <?php if ( current_user_can('manage_options') && '1' != get_option('blog_public') ): ?>
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/edit-comments.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $spammed > 0 ) {
</span><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><del>- $messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) . '">' . __('Undo') . '</a><br />';
</del><ins>+ $messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $unspammed > 0 )
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $trashed > 0 ) {
</span><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><del>- $messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) . '">' . __('Undo') . '</a><br />';
</del><ins>+ $messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $untrashed > 0 )
</span><span class="lines">@@ -176,13 +176,13 @@
</span><span class="cx"> if ( $same > 0 && $comment = get_comment( $same ) ) {
</span><span class="cx"> switch ( $comment->comment_approved ) {
</span><span class="cx"> case '1' :
</span><del>- $messages[] = __('This comment is already approved.') . ' <a href="' . admin_url( "comment.php?action=editcomment&c=$same" ) . '">' . __( 'Edit comment' ) . '</a>';
</del><ins>+ $messages[] = __('This comment is already approved.') . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
</ins><span class="cx"> break;
</span><span class="cx"> case 'trash' :
</span><del>- $messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . admin_url( 'edit-comments.php?comment_status=trash' ) . '"> ' . __( 'View Trash' ) . '</a>';
</del><ins>+ $messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
</ins><span class="cx"> break;
</span><span class="cx"> case 'spam' :
</span><del>- $messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . admin_url( "comment.php?action=editcomment&c=$same" ) . '">' . __( 'Edit comment' ) . '</a>';
</del><ins>+ $messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/edit-form-advanced.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -36,32 +36,32 @@
</span><span class="cx"> $messages = array();
</span><span class="cx"> $messages['post'] = array(
</span><span class="cx"> '',
</span><del>- sprintf( __('Post updated. <a href="%s">View post</a>'), get_permalink($post_ID) ),
</del><ins>+ sprintf( __('Post updated. <a href="%s">View post</a>'), esc_url( get_permalink($post_ID) ) ),
</ins><span class="cx"> __('Custom field updated.'),
</span><span class="cx"> __('Custom field deleted.'),
</span><span class="cx"> __('Post updated.'),
</span><span class="cx"> /* translators: %s: date and time of the revision */
</span><span class="cx"> isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
</span><del>- sprintf( __('Post published. <a href="%s">View post</a>'), get_permalink($post_ID) ),
</del><ins>+ sprintf( __('Post published. <a href="%s">View post</a>'), esc_url( get_permalink($post_ID) ) ),
</ins><span class="cx"> __('Post saved.'),
</span><del>- sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
</del><ins>+ sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
</ins><span class="cx"> sprintf( __('Post scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview post</a>'),
</span><span class="cx"> // translators: Publish box date format, see http://php.net/date
</span><del>- date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
- sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
</del><ins>+ date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post_ID) ) ),
+ sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
</ins><span class="cx"> );
</span><span class="cx"> $messages['page'] = array(
</span><span class="cx"> '',
</span><del>- sprintf( __('Page updated. <a href="%s">View page</a>'), get_permalink($post_ID) ),
</del><ins>+ sprintf( __('Page updated. <a href="%s">View page</a>'), esc_url( get_permalink($post_ID) ) ),
</ins><span class="cx"> __('Custom field updated.'),
</span><span class="cx"> __('Custom field deleted.'),
</span><span class="cx"> __('Page updated.'),
</span><span class="cx"> isset($_GET['revision']) ? sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
</span><del>- sprintf( __('Page published. <a href="%s">View page</a>'), get_permalink($post_ID) ),
</del><ins>+ sprintf( __('Page published. <a href="%s">View page</a>'), esc_url( get_permalink($post_ID) ) ),
</ins><span class="cx"> __('Page saved.'),
</span><del>- sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
- sprintf( __('Page scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
- sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
</del><ins>+ sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
+ sprintf( __('Page scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), esc_url( get_permalink($post_ID) ) ),
+ sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $message = false;
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/edit.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
</span><span class="cx"> printf( _n( 'Item moved to the trash.', '%s items moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
</span><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><del>- echo ' <a href="' . wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) . '">' . __('Undo') . '</a><br />';
</del><ins>+ echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a><br />';
</ins><span class="cx"> unset($_GET['trashed']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -366,8 +366,8 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div class="view-switch">
</span><del>- <a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo includes_url( 'images/blank.gif' ); ?>" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
- <a href="<?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo includes_url( 'images/blank.gif' ); ?>" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
</del><ins>+ <a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
+ <a href="<?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="clear"></div>
</span></span></pre></div>
<a id="trunkwpadminimportlivejournalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/livejournal.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/livejournal.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/import/livejournal.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -976,7 +976,7 @@
</span><span class="cx"> if ( next_counter <= 0 ) {
</span><span class="cx"> if ( jQuery( '#<?php echo $id ?>' ).length ) {
</span><span class="cx"> jQuery( "#<?php echo $id ?> input[type='submit']" ).hide();
</span><del>- str = '<?php _e( "Continuing&#8230;" ) ?> <img src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" id="processing" align="top" />';
</del><ins>+ str = '<?php _e( "Continuing&#8230;" ) ?> <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="processing" align="top" />';
</ins><span class="cx"> jQuery( '#<?php echo $msg ?>' ).html( str );
</span><span class="cx"> jQuery( '#<?php echo $id ?>' ).submit();
</span><span class="cx"> return;
</span><span class="lines">@@ -1005,7 +1005,7 @@
</span><span class="cx"> if ( jQuery( '#<?php echo $id ?>' ).length ) {
</span><span class="cx"> jQuery( "#<?php echo $id ?> input[type='submit']" ).hide();
</span><span class="cx"> jQuery.ajaxSetup({'timeout':3600000});
</span><del>- str = '<?php _e( "Processing next batch." ) ?> <img src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" id="processing" align="top" />';
</del><ins>+ str = '<?php _e( "Processing next batch." ) ?> <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="processing" align="top" />';
</ins><span class="cx"> jQuery( '#<?php echo $msg ?>' ).html( str );
</span><span class="cx"> jQuery('#ljapi-status').load(ajaxurl, {'action':'lj-importer',
</span><span class="cx"> 'import':'livejournal',
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/dashboard.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -383,14 +383,14 @@
</span><span class="cx"> $drafts = false;
</span><span class="cx"> if ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) && isset( $_POST['action'] ) && 0 === strpos( $_POST['action'], 'post-quickpress' ) && (int) $_POST['post_ID'] ) {
</span><span class="cx"> $view = get_permalink( $_POST['post_ID'] );
</span><del>- $edit = get_edit_post_link( $_POST['post_ID'] );
</del><ins>+ $edit = esc_url( get_edit_post_link( $_POST['post_ID'] ) );
</ins><span class="cx"> if ( 'post-quickpress-publish' == $_POST['action'] ) {
</span><span class="cx"> if ( current_user_can('publish_posts') )
</span><del>- printf( '<div class="message"><p>' . __( 'Post Published. <a href="%s">View post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', $view , $edit );
</del><ins>+ printf( '<div class="message"><p>' . __( 'Post Published. <a href="%s">View post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( $view ), $edit );
</ins><span class="cx"> else
</span><del>- printf( '<div class="message"><p>' . __( 'Post submitted. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', add_query_arg( 'preview', 1, $view ), $edit );
</del><ins>+ printf( '<div class="message"><p>' . __( 'Post submitted. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
</ins><span class="cx"> } else {
</span><del>- printf( '<div class="message"><p>' . __( 'Draft Saved. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', add_query_arg( 'preview', 1, $view ), $edit );
</del><ins>+ printf( '<div class="message"><p>' . __( 'Draft Saved. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
</ins><span class="cx"> $drafts_query = new WP_Query( array(
</span><span class="cx"> 'post_type' => 'post',
</span><span class="cx"> 'post_status' => 'draft',
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> $post = get_default_post_to_edit();
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <form name="post" action="<?php echo admin_url( 'post.php' ); ?>" method="post" id="quick-press">
</del><ins>+ <form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press">
</ins><span class="cx"> <h4 id="quick-post-title"><label for="title"><?php _e('Title') ?></label></h4>
</span><span class="cx"> <div class="input-text-wrap">
</span><span class="cx"> <input type="text" name="post_title" id="title" tabindex="1" autocomplete="off" value="<?php echo esc_attr( $post->post_title ); ?>" />
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> <input type="reset" value="<?php esc_attr_e( 'Reset' ); ?>" class="button" />
</span><span class="cx"> <span id="publishing-action">
</span><span class="cx"> <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?>" />
</span><del>- <img class="waiting" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" />
</del><ins>+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
</ins><span class="cx"> </span>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </p>
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx"> $comment_post_url = get_edit_post_link( $comment->comment_post_ID );
</span><span class="cx"> $comment_post_title = strip_tags(get_the_title( $comment->comment_post_ID ));
</span><span class="cx"> $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
</span><del>- $comment_link = '<a class="comment-link" href="' . get_comment_link() . '">#</a>';
</del><ins>+ $comment_link = '<a class="comment-link" href="' . esc_url(get_comment_link()) . '">#</a>';
</ins><span class="cx">
</span><span class="cx"> $actions_string = '';
</span><span class="cx"> if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/media.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -1223,7 +1223,7 @@
</span><span class="cx"> $image_edit_button = '';
</span><span class="cx"> if ( gd_edit_image_support( $post->post_mime_type ) ) {
</span><span class="cx"> $nonce = wp_create_nonce( "image_editor-$post->ID" );
</span><del>- $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . admin_url( 'images/wpspin_light.gif' ) . "' class='imgedit-wait-spin' alt='' />";
</del><ins>+ $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='" . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . "' class='imgedit-wait-spin' alt='' />";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $attachment_url = get_permalink( $attachment_id );
</span><span class="lines">@@ -1640,7 +1640,7 @@
</span><span class="cx"> document.getElementById('go_button').style.color = '#bbb';
</span><span class="cx"> if ( ! document.forms[0].src.value )
</span><span class="cx"> document.getElementById('status_img').innerHTML = '*';
</span><del>- else document.getElementById('status_img').innerHTML = '<img src="<?php echo admin_url( 'images/no.png' ); ?>" alt="" />';
</del><ins>+ else document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/no.png' ) ); ?>" alt="" />';
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateImageData : function() {
</span><span class="lines">@@ -1649,7 +1649,7 @@
</span><span class="cx"> t.width = t.preloadImg.width;
</span><span class="cx"> t.height = t.preloadImg.height;
</span><span class="cx"> document.getElementById('go_button').style.color = '#333';
</span><del>- document.getElementById('status_img').innerHTML = '<img src="<?php echo admin_url( 'images/yes.png' ); ?>" alt="" />';
</del><ins>+ document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/yes.png' ) ); ?>" alt="" />';
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getImageData : function() {
</span><span class="lines">@@ -1659,7 +1659,7 @@
</span><span class="cx"> t.resetImageData();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- document.getElementById('status_img').innerHTML = '<img src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" />';
</del><ins>+ document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />';
</ins><span class="cx"> t.preloadImg = new Image();
</span><span class="cx"> t.preloadImg.onload = t.updateImageData;
</span><span class="cx"> t.preloadImg.onerror = t.resetImageData;
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> <div id="preview-action">
</span><span class="cx"> <?php
</span><span class="cx"> if ( 'publish' == $post->post_status ) {
</span><del>- $preview_link = get_permalink($post->ID);
</del><ins>+ $preview_link = esc_url(get_permalink($post->ID));
</ins><span class="cx"> $preview_button = __('Preview Changes');
</span><span class="cx"> } else {
</span><del>- $preview_link = apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)));
</del><ins>+ $preview_link = esc_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID))));
</ins><span class="cx"> $preview_button = __('Preview');
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="publishing-action">
</span><del>-<img src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" id="ajax-loading" style="visibility:hidden;" alt="" />
</del><ins>+<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" id="ajax-loading" style="visibility:hidden;" alt="" />
</ins><span class="cx"> <?php
</span><span class="cx"> if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
</span><span class="cx"> if ( $can_publish ) :
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> </tr></thead>
</span><span class="cx"> <tbody id="the-comment-list" class="list:comment"></tbody>
</span><span class="cx"> </table>
</span><del>-<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" /></p>
</del><ins>+<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /></p>
</ins><span class="cx"> <?php
</span><span class="cx"> $hidden = get_hidden_meta_boxes('post');
</span><span class="cx"> if ( ! in_array('commentsdiv', $hidden) ) { ?>
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/ms.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> foreach ( (array) $blogs as $key => $details ) {
</span><span class="cx"> $blog_users = get_users_of_blog( $details->userblog_id );
</span><span class="cx"> if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
</span><del>- $user_site = "<a href='" . get_home_url( $details->userblog_id ) . "'>{$details->blogname}</a>";
</del><ins>+ $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
</ins><span class="cx"> $user_dropdown = "<select name='blog[$val][{$key}]'>";
</span><span class="cx"> $user_list = '';
</span><span class="cx"> foreach ( $blog_users as $user ) {
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> All at ###SITENAME###
</span><span class="cx"> ###SITEURL### "), $new_admin_email );
</span><span class="cx">
</span><del>- $content = str_replace( '###ADMIN_URL###', admin_url( 'options.php?adminhash='.$hash ), $content );
</del><ins>+ $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
</ins><span class="cx"> $content = str_replace( '###EMAIL###', $value, $content );
</span><span class="cx"> $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
</span><span class="cx"> $content = str_replace( '###SITEURL###', network_home_url(), $content );
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> All at ###SITENAME###
</span><span class="cx"> ###SITEURL###" ), $new_user_email );
</span><span class="cx">
</span><del>- $content = str_replace( '###ADMIN_URL###', admin_url( 'profile.php?newuseremail='.$hash ), $content );
</del><ins>+ $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
</ins><span class="cx"> $content = str_replace( '###EMAIL###', $_POST['email'], $content);
</span><span class="cx"> $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
</span><span class="cx"> $content = str_replace( '###SITEURL###', network_home_url(), $content );
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx"> <div class="table table_content musubtable">
</span><span class="cx"> <table>
</span><span class="cx"> <tr class="first">
</span><del>- <td class="first b b-posts"><?php printf( __( '<a href="%1$s" title="Manage Uploads" class="musublink">%2$sMB</a>' ), admin_url( 'upload.php' ), $quota ); ?></td>
</del><ins>+ <td class="first b b-posts"><?php printf( __( '<a href="%1$s" title="Manage Uploads" class="musublink">%2$sMB</a>' ), esc_url( admin_url( 'upload.php' ) ), $quota ); ?></td>
</ins><span class="cx"> <td class="t posts"><?php _e( 'Space Allowed' ); ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> <div class="table table_discussion musubtable">
</span><span class="cx"> <table>
</span><span class="cx"> <tr class="first">
</span><del>- <td class="b b-comments"><?php printf( __( '<a href="%1$s" title="Manage Uploads" class="musublink">%2$sMB (%3$s%%)</a>' ), admin_url( 'upload.php' ), $used, $percentused ); ?></td>
</del><ins>+ <td class="b b-comments"><?php printf( __( '<a href="%1$s" title="Manage Uploads" class="musublink">%2$sMB (%3$s%%)</a>' ), esc_url( admin_url( 'upload.php' ) ), $used, $percentused ); ?></td>
</ins><span class="cx"> <td class="last t comments <?php echo $used_color;?>"><?php _e( 'Space Used' );?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> if ( !is_super_admin() )
</span><span class="cx"> return false;
</span><span class="cx"> if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
</span><del>- echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Update Network</a> page to update all your sites.' ), admin_url( 'ms-upgrade-network.php' ) ) . "</div>";
</del><ins>+ echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Update Network</a> page to update all your sites.' ), esc_url( admin_url( 'ms-upgrade-network.php' ) ) ) . "</div>";
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'site_admin_notice' );
</span><span class="cx">
</span><span class="lines">@@ -754,7 +754,7 @@
</span><span class="cx"> <?php foreach( (array) $all_blogs as $blog ) {
</span><span class="cx"> if ( $primary_blog == $blog->userblog_id )
</span><span class="cx"> $found = true;
</span><del>- ?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo get_home_url( $blog->userblog_id ) ?></option><?php
</del><ins>+ ?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
</ins><span class="cx"> } ?>
</span><span class="cx"> </select>
</span><span class="cx"> <?php
</span><span class="lines">@@ -782,7 +782,7 @@
</span><span class="cx"> return;
</span><span class="cx"> $mu_media_buttons = get_site_option( 'mu_media_buttons', array() );
</span><span class="cx"> if ( empty($mu_media_buttons['image']) && current_theme_supports( 'post-thumbnails' ) ) {
</span><del>- echo "<div class='update-nag'>" . sprintf( __( "Warning! The current theme supports Featured Images. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), admin_url( 'ms-options.php' ) ) . "</div>";
</del><ins>+ echo "<div class='update-nag'>" . sprintf( __( "Warning! The current theme supports Featured Images. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), esc_url( admin_url( 'ms-options.php' ) ) ) . "</div>";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'show_post_thumbnail_warning' );
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> * @return none
</span><span class="cx"> */
</span><span class="cx"> function _admin_notice_multisite_activate_plugins_page() {
</span><del>- $message = sprintf( __( 'The plugins page is not visible to normal users. It must be activated first. %s' ), '<a href="' . admin_url( 'ms-options.php#menu' ) . '">' . __( 'Activate' ) . '</a>' );
</del><ins>+ $message = sprintf( __( 'The plugins page is not visible to normal users. It must be activated first. %s' ), '<a href="' . esc_url( admin_url( 'ms-options.php#menu' ) ) . '">' . __( 'Activate' ) . '</a>' );
</ins><span class="cx"> echo "<div class='error'><p>$message</p></div>";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/nav-menu.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx">
</span><span class="cx"> <p class="button-controls">
</span><span class="cx"> <span class="add-to-menu">
</span><del>- <img class="waiting" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" />
</del><ins>+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <input type="submit" class="button-secondary" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" />
</span><span class="cx"> </span>
</span><span class="cx"> </p>
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> </span>
</span><span class="cx">
</span><span class="cx"> <span class="add-to-menu">
</span><del>- <img class="waiting" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" />
</del><ins>+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <input type="submit" class="button-secondary" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" />
</span><span class="cx"> </span>
</span><span class="cx"> </p>
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx"> </span>
</span><span class="cx">
</span><span class="cx"> <span class="add-to-menu">
</span><del>- <img class="waiting" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" />
</del><ins>+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <input type="submit" class="button-secondary" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" />
</span><span class="cx"> </span>
</span><span class="cx"> </p>
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/plugin-install.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> $tags = array();
</span><span class="cx"> foreach ( (array)$api_tags as $tag )
</span><span class="cx"> $tags[ $tag['name'] ] = (object) array(
</span><del>- 'link' => admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])),
</del><ins>+ 'link' => esc_url( admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name'])) ),
</ins><span class="cx"> 'name' => $tag['name'],
</span><span class="cx"> 'id' => sanitize_title_with_dashes($tag['name']),
</span><span class="cx"> 'count' => $tag['count'] );
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/plugin.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -822,7 +822,7 @@
</span><span class="cx"> add_action( $hookname, $function );
</span><span class="cx">
</span><span class="cx"> if ( empty($icon_url) )
</span><del>- $icon_url = admin_url( 'images/generic.png' );
</del><ins>+ $icon_url = esc_url( admin_url( 'images/generic.png' ) );
</ins><span class="cx"> elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
</span><span class="cx"> $icon_url = 'https://' . substr($icon_url, 7);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/template.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
</span><span class="cx"> <?php $update_text = sprintf( __('Update %s'), $tax->singular_label ); ?>
</span><span class="cx"> <a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
</span><del>- <img class="waiting" style="display:none;" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" />
</del><ins>+ <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <span class="error" style="display:none;"></span>
</span><span class="cx"> <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
</span><span class="cx"> <input type="hidden" name="taxonomy" value="<?php echo esc_attr( $tax->name ); ?>" />
</span><span class="lines">@@ -613,7 +613,7 @@
</span><span class="cx"> $posts_columns['tags'] = __('Tags');
</span><span class="cx"> $post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
</span><span class="cx"> if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
</span><del>- $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . admin_url( 'images/comment-grey-bubble.png' ) . '" /></div>';
</del><ins>+ $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
</ins><span class="cx"> $posts_columns['date'] = __('Date');
</span><span class="cx">
</span><span class="cx"> if ( 'page' == $post_type )
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> //$posts_columns['tags'] = _x('Tags', 'column name');
</span><span class="cx"> /* translators: column name */
</span><span class="cx"> $posts_columns['parent'] = _x('Attached to', 'column name');
</span><del>- $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . admin_url( 'images/comment-grey-bubble.png' ) . '" /></div>';
</del><ins>+ $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
</ins><span class="cx"> //$posts_columns['comments'] = __('Comments');
</span><span class="cx"> /* translators: column name */
</span><span class="cx"> $posts_columns['date'] = _x('Date', 'column name');
</span><span class="lines">@@ -1153,7 +1153,7 @@
</span><span class="cx"> $update_text = __( 'Update' );
</span><span class="cx"> ?>
</span><span class="cx"> <a accesskey="s" href="#inline-edit" title="<?php _e('Update'); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
</span><del>- <img class="waiting" style="display:none;" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" />
</del><ins>+ <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <?php } else {
</span><span class="cx"> $update_text = __( 'Update' );
</span><span class="cx"> ?>
</span><span class="lines">@@ -1818,7 +1818,7 @@
</span><span class="cx"> if ($current_user->ID == $user_object->ID) {
</span><span class="cx"> $edit_link = 'profile.php';
</span><span class="cx"> } else {
</span><del>- $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), "user-edit.php?user_id=$user_object->ID" ) );
</del><ins>+ $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( esc_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) );
</ins><span class="cx"> }
</span><span class="cx"> $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
</span><span class="cx">
</span><span class="lines">@@ -2012,7 +2012,7 @@
</span><span class="cx"> $post_type_object = get_post_type_object($post->post_type);
</span><span class="cx"> $user_can = current_user_can($post_type_object->edit_cap, $post->ID);
</span><span class="cx">
</span><del>- $comment_url = get_comment_link($comment->comment_ID);
</del><ins>+ $comment_url = esc_url(get_comment_link($comment->comment_ID));
</ins><span class="cx"> $author_url = get_comment_author_url();
</span><span class="cx"> if ( 'http://' == $author_url )
</span><span class="cx"> $author_url = '';
</span><span class="lines">@@ -2068,7 +2068,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $comment->comment_parent ) {
</span><span class="cx"> $parent = get_comment( $comment->comment_parent );
</span><del>- $parent_link = get_comment_link( $comment->comment_parent );
</del><ins>+ $parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
</ins><span class="cx"> $name = apply_filters( 'get_comment_author', $parent->comment_author ); // there's no API function for this
</span><span class="cx"> printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
</span><span class="cx"> }
</span><span class="lines">@@ -2275,7 +2275,7 @@
</span><span class="cx"> <a href="#comments-form" class="save button-primary alignright" tabindex="104">
</span><span class="cx"> <span id="savebtn" style="display:none;"><?php _e('Update Comment'); ?></span>
</span><span class="cx"> <span id="replybtn" style="display:none;"><?php _e('Submit Reply'); ?></span></a>
</span><del>- <img class="waiting" style="display:none;" src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" />
</del><ins>+ <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</ins><span class="cx"> <span class="error" style="display:none;"></span>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </p>
</span></span></pre></div>
<a id="trunkwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/widgets.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/widgets.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/includes/widgets.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> <a class="widget-control-close" href="#close"><?php _e('Close'); ?></a>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
</span><del>- <img src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" class="ajax-feedback " title="" alt="" />
</del><ins>+ <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback " title="" alt="" />
</ins><span class="cx"> <input type="submit" name="savewidget" class="button-primary widget-control-save" value="<?php esc_attr_e('Save'); ?>" />
</span><span class="cx"> </div>
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminjsrevisionsjsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/revisions-js.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions-js.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/js/revisions-js.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$j = site_url( '/wp-includes/js/jquery/jquery.js' );
</del><ins>+$j = esc_url( site_url( '/wp-includes/js/jquery/jquery.js' ) );
</ins><span class="cx"> $n = esc_html( $GLOBALS['current_user']->data->display_name );
</span><span class="cx"> $d = str_replace( '$', $redirect, dvortr( "Erb-y n.y ydco dall.b aiacbv Wa ce]-irxajt- dp.u]-$-VIr XajtWzaVv" ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmsdeletesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-delete-site.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-delete-site.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/ms-delete-site.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> $hash = wp_generate_password( 20, false );
</span><span class="cx"> update_option( 'delete_blog_hash', $hash );
</span><span class="cx">
</span><del>- $url_delete = admin_url( 'ms-delete-site.php?h=' . $hash );
</del><ins>+ $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
</ins><span class="cx">
</span><span class="cx"> $content = apply_filters( 'delete_site_email_content', __( "Dear User,
</span><span class="cx"> You recently clicked the 'Delete Site' link on your site and filled in a
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/ms-edit.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> if ( empty( $_POST ) )
</span><del>- wp_die( sprintf( __( 'You probably need to go back to the <a href="%s">options page</a>.', admin_url( 'ms-options.php' ) ) ) );
</del><ins>+ wp_die( sprintf( __( 'You probably need to go back to the <a href="%s">options page</a>.', esc_url( admin_url( 'ms-options.php' ) ) ) ) );
</ins><span class="cx">
</span><span class="cx"> if ( isset($_POST['WPLANG']) && ( '' === $_POST['WPLANG'] || in_array( $_POST['WPLANG'], get_available_languages() ) ) )
</span><span class="cx"> update_site_option( 'WPLANG', $_POST['WPLANG'] );
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> if ( empty( $_POST ) )
</span><del>- wp_die( sprintf( __( 'You probably need to go back to the <a href="%s">sites page</a>', admin_url( 'ms-sites.php' ) ) ) );
</del><ins>+ wp_die( sprintf( __( 'You probably need to go back to the <a href="%s">sites page</a>', esc_url( admin_url( 'ms-sites.php' ) ) ) ) );
</ins><span class="cx">
</span><span class="cx"> switch_to_blog( $id );
</span><span class="cx">
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> <?php wp_admin_css( 'install', true ); ?>
</span><span class="cx"> </head>
</span><span class="cx"> <body id="error-page">
</span><del>- <h1 id="logo"><img alt="WordPress" src="<?php echo admin_url( 'images/wordpress-logo.png' ); ?>" /></h1>
</del><ins>+ <h1 id="logo"><img alt="WordPress" src="<?php echo esc_attr( admin_url( 'images/wordpress-logo.png' ) ); ?>" /></h1>
</ins><span class="cx"> <form action="ms-edit.php?action=<?php echo esc_attr( $_GET['action2'] ) ?>" method="post">
</span><span class="cx"> <input type="hidden" name="action" value="<?php echo esc_attr( $_GET['action2'] ) ?>" />
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/ms-options.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> <?php _e( 'Display the latest post from this RSS or Atom feed on all site dashboards. Leave blank to disable.' ); ?><br />
</span><span class="cx">
</span><span class="cx"> <?php if ( get_site_option( 'admin_notice_feed' ) != get_home_url( $current_site->id, 'feed/' ) )
</span><del>- echo __( 'A good one to use would be the feed from your main site: ' ) . get_home_url( $current_site->id, 'feed/' ); ?></td>
</del><ins>+ echo __( 'A good one to use would be the feed from your main site: ' ) . esc_url( get_home_url( $current_site->id, 'feed/' ) ) ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <h3><?php _e( 'Registration Settings' ); ?></h3>
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/ms-sites.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>- <h2><?php _e( 'Edit Site' ); ?> - <a href="<?php echo get_home_url( $id ); ?>"><?php echo get_home_url( $id ); ?></a></h2>
</del><ins>+ <h2><?php _e( 'Edit Site' ); ?> - <a href="<?php echo esc_url( get_home_url( $id ) ); ?>"><?php echo esc_url( get_home_url( $id ) ); ?></a></h2>
</ins><span class="cx"> <form method="post" action="ms-edit.php?action=updateblog">
</span><span class="cx"> <?php wp_nonce_field( 'editblog' ); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="lines">@@ -433,8 +433,8 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div class="view-switch">
</span><del>- <a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo includes_url( 'images/blank.gif' ); ?>" width="20" height="20" title="<?php _e( 'List View' ) ?>" alt="<?php _e( 'List View' ) ?>" /></a>
- <a href="<?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo includes_url( 'images/blank.gif' ); ?>" width="20" height="20" title="<?php _e( 'Excerpt View' ) ?>" alt="<?php _e( 'Excerpt View' ) ?>" /></a>
</del><ins>+ <a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e( 'List View' ) ?>" alt="<?php _e( 'List View' ) ?>" /></a>
+ <a href="<?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e( 'Excerpt View' ) ?>" alt="<?php _e( 'Excerpt View' ) ?>" /></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx">
</span><span class="cx"> case 'blogname': ?>
</span><span class="cx"> <td class="column-title">
</span><del>- <a href="<?php echo admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
</del><ins>+ <a href="<?php echo esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
</ins><span class="cx"> <?php
</span><span class="cx"> if ( 'list' != $mode )
</span><span class="cx"> echo '<p>' . sprintf( _x( '%1$s &#8211; <em>%2$s', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '</em></p>';
</span><span class="lines">@@ -546,28 +546,28 @@
</span><span class="cx"> 'visit' => '',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $actions['edit'] = '<span class="edit"><a href="' . admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) . '">' . __( 'Edit' ) . '</a><span>';
- $actions['backend'] = "<span class='backend'><a href='" . get_admin_url($blog['blog_id']) . "' class='edit'>" . __( 'Backend' ) . '</a></span>';
</del><ins>+ $actions['edit'] = '<span class="edit"><a href="' . esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a><span>';
+ $actions['backend'] = "<span class='backend'><a href='" . esc_url( get_admin_url($blog['blog_id']) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>';
</ins><span class="cx"> if ( $current_site->blog_id != $blog['blog_id'] ) {
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
</span><del>- $actions['activate'] = '<span class="activate"><a href="' . admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
</del><ins>+ $actions['activate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
</ins><span class="cx"> else
</span><del>- $actions['deactivate'] = '<span class="activate"><a href="' . admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
</del><ins>+ $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
</ins><span class="cx">
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
</span><del>- $actions['unarchive'] = '<span class="archive"><a href="' . admin_url( 'ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
</del><ins>+ $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
</ins><span class="cx"> else
</span><del>- $actions['archive'] = '<span class="archive"><a href="' . admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) . '">' . __( 'Archive' ) . '</a></span>';
</del><ins>+ $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Archive' ) . '</a></span>';
</ins><span class="cx">
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
</span><del>- $actions['unspam'] = '<span class="spam"><a href="' . admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>';
</del><ins>+ $actions['unspam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>';
</ins><span class="cx"> else
</span><del>- $actions['spam'] = '<span class="spam"><a href="' . admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) . '">' . __( 'Spam' ) . '</a></span>';
</del><ins>+ $actions['spam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '">' . __( 'Spam' ) . '</a></span>';
</ins><span class="cx">
</span><del>- $actions['delete'] = '<span class="delete"><a href="' . admin_url( 'ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) . '">' . __( 'Delete' ) . '</a></span>';
</del><ins>+ $actions['delete'] = '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $actions['visit'] = "<span class='view'><a href='" . get_home_url( $blog['blog_id'] ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>';
</del><ins>+ $actions['visit'] = "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>';
</ins><span class="cx"> $actions = array_filter( $actions );
</span><span class="cx"> if ( count( $actions ) ) : ?>
</span><span class="cx"> <div class="row-actions">
</span><span class="lines">@@ -608,10 +608,10 @@
</span><span class="cx"> $blogusers_warning = '';
</span><span class="cx"> if ( count( $blogusers ) > 5 ) {
</span><span class="cx"> $blogusers = array_slice( $blogusers, 0, 5 );
</span><del>- $blogusers_warning = __( 'Only showing first 5 users.' ) . ' <a href="' . get_admin_url( $blog['blog_id'], 'users.php' ) . '">' . __( 'More' ) . '</a>';
</del><ins>+ $blogusers_warning = __( 'Only showing first 5 users.' ) . ' <a href="' . esc_url( get_admin_url( $blog['blog_id'], 'users.php' ) ) . '">' . __( 'More' ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> foreach ( $blogusers as $key => $val ) {
</span><del>- echo '<a href="' . admin_url( 'user-edit.php?user_id=' . $val->user_id ) . '">' . esc_html( $val->user_login ) . '</a> ';
</del><ins>+ echo '<a href="' . esc_url( admin_url( 'user-edit.php?user_id=' . $val->user_id ) ) . '">' . esc_html( $val->user_login ) . '</a> ';
</ins><span class="cx"> if ( 'list' != $mode )
</span><span class="cx"> echo '(' . $val->user_email . ')';
</span><span class="cx"> echo '<br />';
</span></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/ms-themes.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> $allowed_themes = get_site_allowed_themes();
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>- <form action="<?php echo admin_url( 'ms-edit.php?action=updatethemes' ); ?>" method="post">
</del><ins>+ <form action="<?php echo esc_url( admin_url( 'ms-edit.php?action=updatethemes' ) ); ?>" method="post">
</ins><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e( 'Network Themes' ) ?></h2>
</span><span class="cx"> <p><?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?></p>
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/ms-users.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -149,8 +149,8 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div class="view-switch">
</span><del>- <a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo includes_url( 'images/blank.gif' ); ?>" width="20" height="20" title="<?php _e( 'List View' ) ?>" alt="<?php _e( 'List View' ) ?>" /></a>
- <a href="<?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo includes_url( 'images/blank.gif' ); ?>" width="20" height="20" title="<?php _e( 'Excerpt View' ) ?>" alt="<?php _e( 'Excerpt View' ) ?>" /></a>
</del><ins>+ <a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e( 'List View' ) ?>" alt="<?php _e( 'List View' ) ?>" /></a>
+ <a href="<?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e( 'Excerpt View' ) ?>" alt="<?php _e( 'Excerpt View' ) ?>" /></a>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="clear"></div>
</span><span class="lines">@@ -230,15 +230,15 @@
</span><span class="cx"> $edit_link = ( $current_user->ID == $user['ID'] ) ? 'profile.php' : 'user-edit.php?user_id=' . $user['ID'];
</span><span class="cx"> ?>
</span><span class="cx"> <td class="username column-username">
</span><del>- <?php echo $avatar; ?><strong><a href="<?php echo admin_url( $edit_link ); ?>" class="edit"><?php echo stripslashes( $user['user_login'] ); ?></a><?php
</del><ins>+ <?php echo $avatar; ?><strong><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user['user_login'] ); ?></a><?php
</ins><span class="cx"> if ( in_array( $user['user_login'], $super_admins ) )
</span><span class="cx"> echo ' - ' . __( 'Super admin' );
</span><span class="cx"> ?></strong>
</span><span class="cx"> <br/>
</span><span class="cx"> <div class="row-actions">
</span><del>- <span class="edit"><a href="<?php echo admin_url( $edit_link ); ?>"><?php _e( 'Edit' ); ?></a></span>
</del><ins>+ <span class="edit"><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>"><?php _e( 'Edit' ); ?></a></span>
</ins><span class="cx"> <?php if ( ! in_array( $user['user_login'], $super_admins ) ) { ?>
</span><del>- | <span class="delete"><a href="<?php echo $delete = admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'ms-edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) ); ?>" class="delete"><?php _e( 'Delete' ); ?></a></span>
</del><ins>+ | <span class="delete"><a href="<?php echo $delete = esc_url( admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'ms-edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) ) ); ?>" class="delete"><?php _e( 'Delete' ); ?></a></span>
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> </div>
</span><span class="cx"> </td>
</span><span class="lines">@@ -273,17 +273,17 @@
</span><span class="cx"> if ( is_array( $blogs ) ) {
</span><span class="cx"> foreach ( (array) $blogs as $key => $val ) {
</span><span class="cx"> $path = ( $val->path == '/' ) ? '' : $val->path;
</span><del>- echo '<a href="'. admin_url( 'ms-sites.php?action=editblog&amp;id=' . $val->userblog_id ) .'">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</del><ins>+ echo '<a href="'. esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</ins><span class="cx"> echo ' <small class="row-actions">';
</span><span class="cx">
</span><span class="cx"> // Edit
</span><del>- echo '<a href="'. admin_url( 'ms-sites.php?action=editblog&amp;id=' . $val->userblog_id ) .'">' . __( 'Edit' ) . '</a> | ';
</del><ins>+ echo '<a href="'. esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a> | ';
</ins><span class="cx">
</span><span class="cx"> // View
</span><span class="cx"> echo '<a ';
</span><span class="cx"> if ( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
</span><span class="cx"> echo 'style="background-color: #faa" ';
</span><del>- echo 'href="' . get_home_url( $val->userblog_id ) . '">' . __( 'View' ) . '</a>';
</del><ins>+ echo 'href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
</ins><span class="cx">
</span><span class="cx"> echo '</small><br />';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminmysitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/my-sites.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/my-sites.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/my-sites.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> $s = $i == 3 ? '' : 'border-right: 1px solid #ccc;';
</span><span class="cx"> echo "<td valign='top' style='$s'>";
</span><span class="cx"> echo "<h3>{$user_blog->blogname}</h3>";
</span><del>- echo "<p>" . apply_filters( 'myblogs_blog_actions', "<a href='" . get_home_url( $user_blog->userblog_id ). "'>" . __( 'Visit' ) . "</a> | <a href='" . get_admin_url( $user_blog->userblog_id ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
</del><ins>+ echo "<p>" . apply_filters( 'myblogs_blog_actions', "<a href='" . esc_url( get_home_url( $user_blog->userblog_id ) ). "'>" . __( 'Visit' ) . "</a> | <a href='" . esc_url( get_admin_url( $user_blog->userblog_id ) ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
</ins><span class="cx"> echo apply_filters( 'myblogs_options', '', $user_blog );
</span><span class="cx"> echo "</td>";
</span><span class="cx"> $i++;
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/network.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> function network_step1( $errors = false ) {
</span><span class="cx">
</span><span class="cx"> if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
</span><del>- echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), admin_url( 'options-general.php' ) ) . '</strong></p></div>';
</del><ins>+ echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</strong></p></div>';
</ins><span class="cx"> include ('./admin-footer.php' );
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> echo '<p>' . __( 'You cannot use an IP address such as <code>127.0.0.1</code>.' ) . '</p>';
</span><span class="cx"> else
</span><span class="cx"> echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
</span><del>- echo '<a href="' . admin_url() . '">' . __( 'Return to Dashboard' ) . '</a>';
</del><ins>+ echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
</ins><span class="cx"> include( './admin-footer.php' );
</span><span class="cx"> die();
</span><span class="cx"> }
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> </textarea></li>
</span><span class="cx"> </ol>
</span><span class="cx"> <?php if ( !is_multisite() ) { ?>
</span><del>- <p><?php printf( __( 'Once you complete these steps, your network is enabled and configured.') ); ?> <a href="<?php echo admin_url(); ?>"><?php _e( 'Return to Dashboard' ); ?></a></p>
</del><ins>+ <p><?php printf( __( 'Once you complete these steps, your network is enabled and configured.') ); ?> <a href="<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Return to Dashboard' ); ?></a></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/options-general.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> $new_admin_email = get_option( 'new_admin_email' );
</span><span class="cx"> if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
</span><span class="cx"> <div class="updated inline">
</span><del>-<p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_admin_email, admin_url( 'options.php?dismiss=new_admin_email' ) ); ?></p>
</del><ins>+<p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_admin_email, esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </td>
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/press-this.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> jQuery('#waiting').hide();
</span><span class="cx"> jQuery('#extra-fields').show();
</span><span class="cx"> }
</span><del>- jQuery('#extra-fields').before('<div id="waiting"><img src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
</del><ins>+ jQuery('#extra-fields').before('<div id="waiting"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
</ins><span class="cx">
</span><span class="cx"> if(photostorage == false) {
</span><span class="cx"> jQuery.ajax({
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <br /><br /><input class="button-primary" type="submit" name="review" value="<?php esc_attr_e('Submit for Review') ?>" id="review" />
</span><span class="cx"> <?php } ?>
</span><del>- <img src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" alt="" id="saving" style="display:none;" />
</del><ins>+ <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="saving" style="display:none;" />
</ins><span class="cx"> </p>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -563,11 +563,11 @@
</span><span class="cx">
</span><span class="cx"> <li id="photo_button">
</span><span class="cx"> Add: <?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#">
</span><del>-<img alt="<?php _e('Insert an Image'); ?>" src="<?php echo admin_url( 'images/media-button-image.gif' ); ?>"/></a>
</del><ins>+<img alt="<?php _e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif' ) ); ?>"/></a>
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> </li>
</span><span class="cx"> <li id="video_button">
</span><del>- <a title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="<?php echo admin_url( 'images/media-button-video.gif' ); ?>"/></a>
</del><ins>+ <a title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-video.gif' ) ); ?>"/></a>
</ins><span class="cx"> </li>
</span><span class="cx"> <?php if ( user_can_richedit() ) { ?>
</span><span class="cx"> <li id="switcher">
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/themes.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> $parent_theme = $themes[$theme_name]['Parent Theme'];
</span><span class="cx"> $theme_root = $themes[$theme_name]['Theme Root'];
</span><span class="cx"> $theme_root_uri = $themes[$theme_name]['Theme Root URI'];
</span><del>- $preview_link = trailingslashit( home_url() );
</del><ins>+ $preview_link = esc_url(get_option('home') . '/');
</ins><span class="cx"> if ( is_ssl() )
</span><span class="cx"> $preview_link = str_replace( 'http://', 'https://', $preview_link );
</span><span class="cx"> $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), $preview_link ) );
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/update-core.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> show_message( __('Installation Failed') );
</span><span class="cx"> } else {
</span><span class="cx"> show_message( __('WordPress updated successfully') );
</span><del>- show_message( '<strong>' . __('Actions:') . '</strong> <a href="' . admin_url() . '">' . __('Go to Dashboard') . '</a>' );
</del><ins>+ show_message( '<strong>' . __('Actions:') . '</strong> <a href="' . esc_url( admin_url() ) . '">' . __('Go to Dashboard') . '</a>' );
</ins><span class="cx"> }
</span><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/upload.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
</span><span class="cx"> $message = sprintf( _n( 'Media attachment moved to the trash.', '%d media attachments moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
</span><del>- $message .= ' <a href="' . wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) . '">' . __('Undo') . '</a>';
</del><ins>+ $message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
</ins><span class="cx"> $_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> $messages[1] = __('Media attachment updated.');
</span><span class="cx"> $messages[2] = __('Media permanently deleted.');
</span><span class="cx"> $messages[3] = __('Error saving media attachment.');
</span><del>-$messages[4] = __('Media moved to the trash.') . ' <a href="' . wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) . '">' . __('Undo') . '</a>';
</del><ins>+$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
</ins><span class="cx"> $messages[5] = __('Media restored from the trash.');
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['message']) && (int) $_GET['message'] ) {
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/user-edit.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx">
</span><del>-<form id="your-profile" action="<?php echo admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ); ?>" method="post"<?php do_action('user_edit_form_tag'); ?>>
</del><ins>+<form id="your-profile" action="<?php echo esc_url( admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post"<?php do_action('user_edit_form_tag'); ?>>
</ins><span class="cx"> <?php wp_nonce_field('update-user_' . $user_id) ?>
</span><span class="cx"> <?php if ( $wp_http_referer ) : ?>
</span><span class="cx"> <input type="hidden" name="wp_http_referer" value="<?php echo esc_url($wp_http_referer); ?>" />
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-admin/widgets.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"><br /></div>
</span><span class="cx"> <h3><?php _e('Inactive Widgets'); ?>
</span><del>- <span><img src="<?php echo admin_url( 'images/wpspin_light.gif' ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
</del><ins>+ <span><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
</ins><span class="cx"> <div class="widget-holder inactive">
</span><span class="cx"> <p class="description"><?php _e('Drag widgets here to remove them from the sidebar but keep their settings.'); ?></p>
</span><span class="cx"> <?php wp_list_widget_controls('wp_inactive_widgets'); ?>
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"><br /></div>
</span><span class="cx"> <h3><?php echo esc_html( $registered_sidebar['name'] ); ?>
</span><del>- <span><img src="<?php echo admin_url( 'images/wpspin_dark.gif' ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
</del><ins>+ <span><img src="<?php echo esc_url( admin_url( 'images/wpspin_dark.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
</ins><span class="cx"> <?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> <br />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <div class="comment-meta commentmetadata"><a href="<?php echo get_comment_link( $comment->comment_ID ); ?>"><?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ),' ','' ); ?></div>
</del><ins>+ <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ),' ','' ); ?></div>
</ins><span class="cx">
</span><span class="cx"> <div class="comment-body"><?php comment_text(); ?></div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-includes/comment-template.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -1032,7 +1032,7 @@
</span><span class="cx"> $link = '';
</span><span class="cx">
</span><span class="cx"> if ( get_option('comment_registration') && !$user_ID )
</span><del>- $link = '<a rel="nofollow" class="comment-reply-login" href="' . wp_login_url( get_permalink() ) . '">' . $login_text . '</a>';
</del><ins>+ $link = '<a rel="nofollow" class="comment-reply-login" href="' . esc_url( wp_login_url( get_permalink() ) ) . '">' . $login_text . '</a>';
</ins><span class="cx"> else
</span><span class="cx"> $link = "<a rel='nofollow' class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
</span><span class="cx"> return apply_filters('comment_reply_link', $before . $link . $after, $args, $comment, $post);
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-includes/default-widgets.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx"> <?php if ( $title ) echo $before_title . $title . $after_title; ?>
</span><span class="cx"> <ul id="recentcomments"><?php
</span><span class="cx"> if ( $comments ) : foreach ( (array) $comments as $comment) :
</span><del>- echo '<li class="recentcomments">' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '<a href="' . get_comment_link($comment->comment_ID) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
</del><ins>+ echo '<li class="recentcomments">' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '<a href="' . esc_url( get_comment_link($comment->comment_ID) ) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
</ins><span class="cx"> endforeach; endif;?></ul>
</span><span class="cx"> <?php echo $after_widget; ?>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-includes/general-template.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -184,9 +184,9 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_loginout($redirect = '', $echo = true) {
</span><span class="cx"> if ( ! is_user_logged_in() )
</span><del>- $link = '<a href="' . wp_login_url($redirect) . '">' . __('Log in') . '</a>';
</del><ins>+ $link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
</ins><span class="cx"> else
</span><del>- $link = '<a href="' . wp_logout_url($redirect) . '">' . __('Log out') . '</a>';
</del><ins>+ $link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
</ins><span class="cx">
</span><span class="cx"> if ( $echo )
</span><span class="cx"> echo apply_filters('loginout', $link);
</span><span class="lines">@@ -2108,9 +2108,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . wp_admin_css_uri( $file ) . "' type='text/css' />\n", $file );
</del><ins>+ echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
</ins><span class="cx"> if ( is_rtl() )
</span><del>- echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . wp_admin_css_uri( "$file-rtl" ) . "' type='text/css' />\n", "$file-rtl" );
</del><ins>+ echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-includes/link-template.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -784,6 +784,11 @@
</span><span class="cx"> if ( !$post = &get_post( $id ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if ( 'display' == $context )
+ $action = '&amp;action=edit';
+ else
+ $action = '&action=edit';
+
</ins><span class="cx"> $post_type_object = get_post_type_object( $post->post_type );
</span><span class="cx"> if ( !$post_type_object )
</span><span class="cx"> return;
</span><span class="lines">@@ -791,14 +796,7 @@
</span><span class="cx"> if ( !current_user_can( $post_type_object->edit_cap, $post->ID ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $url = admin_url( sprintf($post_type_object->_edit_link, $post->ID) );
-
- if ( 'display' == $context )
- $url .= '&amp;action=edit';
- else
- $url .= '&action=edit';
-
- return apply_filters( 'get_edit_post_link', $url , $post->ID, $context );
</del><ins>+ return apply_filters( 'get_edit_post_link', admin_url( sprintf($post_type_object->_edit_link . $action, $post->ID) ), $post->ID, $context );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1826,8 +1824,8 @@
</span><span class="cx"> * @param string $scheme (optional) Scheme to give the home url context. Currently 'http','https'
</span><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</span><del>-function home_url( $path = '', $scheme = null, $esc_url = true ) {
- return get_home_url(null, $path, $scheme, $esc_url);
</del><ins>+function home_url( $path = '', $scheme = null ) {
+ return get_home_url(null, $path, $scheme);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1845,7 +1843,7 @@
</span><span class="cx"> * @param string $scheme (optional) Scheme to give the home url context. Currently 'http','https'
</span><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</span><del>-function get_home_url( $blog_id = null, $path = '', $scheme = null, $esc_url = true ) {
</del><ins>+function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
</ins><span class="cx"> $orig_scheme = $scheme;
</span><span class="cx">
</span><span class="cx"> if ( !in_array($scheme, array('http', 'https')) )
</span><span class="lines">@@ -1861,12 +1859,7 @@
</span><span class="cx"> if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
</span><span class="cx"> $url .= '/' . ltrim( $path, '/' );
</span><span class="cx">
</span><del>- $url = apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
</del><ins>+ return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1885,8 +1878,8 @@
</span><span class="cx"> * @param string $scheme Optional. Scheme to give the site url context. Currently 'http','https', 'login', 'login_post', or 'admin'.
</span><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</span><del>-function site_url( $path = '', $scheme = null, $esc_url = true ) {
- return get_site_url(null, $path, $scheme, $esc_url);
</del><ins>+function site_url( $path = '', $scheme = null ) {
+ return get_site_url(null, $path, $scheme);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1904,7 +1897,7 @@
</span><span class="cx"> * @param string $scheme Optional. Scheme to give the site url context. Currently 'http','https', 'login', 'login_post', or 'admin'.
</span><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</span><del>-function get_site_url( $blog_id = null, $path = '', $scheme = null, $esc_url = true ) {
</del><ins>+function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
</ins><span class="cx"> // should the list of allowed schemes be maintained elsewhere?
</span><span class="cx"> $orig_scheme = $scheme;
</span><span class="cx"> if ( !in_array($scheme, array('http', 'https')) ) {
</span><span class="lines">@@ -1928,12 +1921,7 @@
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="cx"> $url .= '/' . ltrim($path, '/');
</span><span class="cx">
</span><del>- $url = apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
</del><ins>+ return apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1946,8 +1934,8 @@
</span><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><span class="cx"> * @return string Admin url link with optional path appended
</span><span class="cx"> */
</span><del>-function admin_url( $path = '', $scheme = 'admin', $esc_url = true ) {
- return get_admin_url(null, $path, $scheme, $esc_url);
</del><ins>+function admin_url( $path = '', $scheme = 'admin' ) {
+ return get_admin_url(null, $path, $scheme);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1961,18 +1949,13 @@
</span><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><span class="cx"> * @return string Admin url link with optional path appended
</span><span class="cx"> */
</span><del>-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin', $esc_url = true ) {
</del><ins>+function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
</ins><span class="cx"> $url = get_site_url($blog_id, 'wp-admin/', $scheme);
</span><span class="cx">
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="cx"> $url .= ltrim($path, '/');
</span><span class="cx">
</span><del>- $url = apply_filters('admin_url', $url, $path, $blog_id);
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
</del><ins>+ return apply_filters('admin_url', $url, $path, $blog_id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1984,18 +1967,13 @@
</span><span class="cx"> * @param string $path Optional. Path relative to the includes url.
</span><span class="cx"> * @return string Includes url link with optional path appended.
</span><span class="cx"> */
</span><del>-function includes_url($path = '', $esc_url = true) {
</del><ins>+function includes_url($path = '') {
</ins><span class="cx"> $url = site_url() . '/' . WPINC . '/';
</span><span class="cx">
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="cx"> $url .= ltrim($path, '/');
</span><span class="cx">
</span><del>- $url = apply_filters('includes_url', $url, $path);
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
</del><ins>+ return apply_filters('includes_url', $url, $path);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2007,7 +1985,7 @@
</span><span class="cx"> * @param string $path Optional. Path relative to the content url.
</span><span class="cx"> * @return string Content url link with optional path appended.
</span><span class="cx"> */
</span><del>-function content_url($path = '', $esc_url = true) {
</del><ins>+function content_url($path = '') {
</ins><span class="cx"> $url = WP_CONTENT_URL;
</span><span class="cx"> if ( 0 === strpos($url, 'http') && is_ssl() )
</span><span class="cx"> $url = str_replace( 'http://', 'https://', $url );
</span><span class="lines">@@ -2015,12 +1993,7 @@
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="cx"> $url .= '/' . ltrim($path, '/');
</span><span class="cx">
</span><del>- $url = apply_filters('content_url', $url, $path);
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
</del><ins>+ return apply_filters('content_url', $url, $path);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2034,7 +2007,7 @@
</span><span class="cx"> * @param string $plugin Optional. The plugin file that you want to be relative to - i.e. pass in __FILE__
</span><span class="cx"> * @return string Plugins url link with optional path appended.
</span><span class="cx"> */
</span><del>-function plugins_url($path = '', $plugin = '', $esc_url = true) {
</del><ins>+function plugins_url($path = '', $plugin = '') {
</ins><span class="cx">
</span><span class="cx"> $mu_plugin_dir = WPMU_PLUGIN_DIR;
</span><span class="cx"> foreach ( array('path', 'plugin', 'mu_plugin_dir') as $var ) {
</span><span class="lines">@@ -2059,13 +2032,7 @@
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="cx"> $url .= '/' . ltrim($path, '/');
</span><span class="cx">
</span><del>- $url = apply_filters('plugins_url', $url, $path, $plugin);
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
-
</del><ins>+ return apply_filters('plugins_url', $url, $path, $plugin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2082,7 +2049,7 @@
</span><span class="cx"> * @param string $scheme Optional. Scheme to give the site url context. Currently 'http','https', 'login', 'login_post', or 'admin'.
</span><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</span><del>-function network_site_url( $path = '', $scheme = null, $esc_url = true ) {
</del><ins>+function network_site_url( $path = '', $scheme = null ) {
</ins><span class="cx"> global $current_site;
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() )
</span><span class="lines">@@ -2107,12 +2074,7 @@
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="cx"> $url .= ltrim($path, '/');
</span><span class="cx">
</span><del>- $url = apply_filters('network_site_url', $url, $path, $orig_scheme);
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
</del><ins>+ return apply_filters('network_site_url', $url, $path, $orig_scheme);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2129,7 +2091,7 @@
</span><span class="cx"> * @param string $scheme (optional) Scheme to give the home url context. Currently 'http','https'
</span><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</span><del>-function network_home_url( $path = '', $scheme = null, $esc_url = true ) {
</del><ins>+function network_home_url( $path = '', $scheme = null ) {
</ins><span class="cx"> global $current_site;
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() )
</span><span class="lines">@@ -2147,12 +2109,7 @@
</span><span class="cx"> if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
</span><span class="cx"> $url .= ltrim( $path, '/' );
</span><span class="cx">
</span><del>- $url = apply_filters( 'network_home_url', $url, $path, $orig_scheme);
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
</del><ins>+ return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2165,18 +2122,13 @@
</span><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><span class="cx"> * @return string Admin url link with optional path appended
</span><span class="cx"> */
</span><del>-function network_admin_url( $path = '', $scheme = 'admin', $esc_url = true ) {
</del><ins>+function network_admin_url( $path = '', $scheme = 'admin' ) {
</ins><span class="cx"> $url = network_site_url('wp-admin/', $scheme);
</span><span class="cx">
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="cx"> $url .= ltrim($path, '/');
</span><span class="cx">
</span><del>- $url = apply_filters('network_admin_url', $url, $path);
-
- if ( $esc_url )
- $url = esc_url($url);
-
- return $url;
</del><ins>+ return apply_filters('network_admin_url', $url, $path);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14373 => 14374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-05-03 16:59:51 UTC (rev 14373)
+++ trunk/wp-includes/ms-functions.php 2010-05-03 18:16:22 UTC (rev 14374)
</span><span class="lines">@@ -852,7 +852,7 @@
</span><span class="cx"> if ( is_email($email) == false )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $options_site_url = network_admin_url('ms-options.php');
</del><ins>+ $options_site_url = esc_url(network_admin_url('ms-options.php'));
</ins><span class="cx">
</span><span class="cx"> switch_to_blog( $blog_id );
</span><span class="cx"> $blogname = get_option( 'blogname' );
</span><span class="lines">@@ -881,7 +881,7 @@
</span><span class="cx">
</span><span class="cx"> $user = new WP_User($user_id);
</span><span class="cx">
</span><del>- $options_site_url = network_admin_url('ms-options.php');
</del><ins>+ $options_site_url = esc_url(network_admin_url('ms-options.php'));
</ins><span class="cx"> $msg = sprintf(__('New User: %1s
</span><span class="cx"> Remote IP: %2s
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>