<!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>[14347] trunk: Escape links by default.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14347">14347</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-02 22:53:59 +0000 (Sun, 02 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Escape links by default.  Props alexkingorg. 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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/admin-header.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -105,9 +105,9 @@
</span><span class="cx"> }
</span><span class="cx"> ?&gt;
</span><span class="cx"> 
</span><del>-&lt;img id=&quot;header-logo&quot; src=&quot;&lt;?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?&gt;&quot; alt=&quot;&quot; width=&quot;32&quot; height=&quot;32&quot; /&gt;
</del><ins>+&lt;img id=&quot;header-logo&quot; src=&quot;&lt;?php echo includes_url( 'images/blank.gif' ); ?&gt;&quot; alt=&quot;&quot; width=&quot;32&quot; height=&quot;32&quot; /&gt;
</ins><span class="cx"> &lt;h1 id=&quot;site-heading&quot; &lt;?php echo $title_class ?&gt;&gt;
</span><del>-        &lt;a href=&quot;&lt;?php echo trailingslashit( get_bloginfo( 'url' ) ); ?&gt;&quot; title=&quot;&lt;?php esc_attr_e('Visit Site') ?&gt;&quot;&gt;
</del><ins>+        &lt;a href=&quot;&lt;?php echo trailingslashit( home_url() ); ?&gt;&quot; title=&quot;&lt;?php esc_attr_e('Visit Site') ?&gt;&quot;&gt;
</ins><span class="cx">                 &lt;span id=&quot;site-title&quot;&gt;&lt;?php echo $blog_name ?&gt;&lt;/span&gt;
</span><span class="cx">         &lt;/a&gt;
</span><span class="cx"> &lt;?php if ( current_user_can('manage_options') &amp;&amp; '1' != get_option('blog_public') ): ?&gt;
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/edit-comments.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( $spammed &gt; 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 ) . ' &lt;a href=&quot;' . esc_url( wp_nonce_url( &quot;edit-comments.php?doaction=undo&amp;action=unspam&amp;ids=$ids&quot;, &quot;bulk-comments&quot; ) ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;&lt;br /&gt;';
</del><ins>+                        $messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' &lt;a href=&quot;' . wp_nonce_url( &quot;edit-comments.php?doaction=undo&amp;action=unspam&amp;ids=$ids&quot;, &quot;bulk-comments&quot; ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;&lt;br /&gt;';
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( $unspammed &gt; 0 )
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( $trashed &gt; 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 ) . ' &lt;a href=&quot;' . esc_url( wp_nonce_url( &quot;edit-comments.php?doaction=undo&amp;action=untrash&amp;ids=$ids&quot;, &quot;bulk-comments&quot; ) ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;&lt;br /&gt;';
</del><ins>+                        $messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' &lt;a href=&quot;' . wp_nonce_url( &quot;edit-comments.php?doaction=undo&amp;action=untrash&amp;ids=$ids&quot;, &quot;bulk-comments&quot; ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;&lt;br /&gt;';
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( $untrashed &gt; 0 )
</span><span class="lines">@@ -176,13 +176,13 @@
</span><span class="cx">                 if ( $same &gt; 0 &amp;&amp; $comment = get_comment( $same ) ) {
</span><span class="cx">                         switch ( $comment-&gt;comment_approved ) {
</span><span class="cx">                                 case '1' :
</span><del>-                                        $messages[] = __('This comment is already approved.') . ' &lt;a href=&quot;' . esc_url( admin_url( &quot;comment.php?action=editcomment&amp;c=$same&quot; ) ) . '&quot;&gt;' . __( 'Edit comment' ) . '&lt;/a&gt;';
</del><ins>+                                        $messages[] = __('This comment is already approved.') . ' &lt;a href=&quot;' . admin_url( &quot;comment.php?action=editcomment&amp;c=$same&quot; ) . '&quot;&gt;' . __( 'Edit comment' ) . '&lt;/a&gt;';
</ins><span class="cx">                                         break;
</span><span class="cx">                                 case 'trash' :
</span><del>-                                        $messages[] = __( 'This comment is already in the Trash.' ) . ' &lt;a href=&quot;' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '&quot;&gt; ' . __( 'View Trash' ) . '&lt;/a&gt;';
</del><ins>+                                        $messages[] = __( 'This comment is already in the Trash.' ) . ' &lt;a href=&quot;' . admin_url( 'edit-comments.php?comment_status=trash' ) . '&quot;&gt; ' . __( 'View Trash' ) . '&lt;/a&gt;';
</ins><span class="cx">                                         break;
</span><span class="cx">                                 case 'spam' :
</span><del>-                                        $messages[] = __( 'This comment is already marked as spam.' ) . ' &lt;a href=&quot;' . esc_url( admin_url( &quot;comment.php?action=editcomment&amp;c=$same&quot; ) ) . '&quot;&gt;' . __( 'Edit comment' ) . '&lt;/a&gt;';
</del><ins>+                                        $messages[] = __( 'This comment is already marked as spam.' ) . ' &lt;a href=&quot;' . admin_url( &quot;comment.php?action=editcomment&amp;c=$same&quot; ) . '&quot;&gt;' . __( 'Edit comment' ) . '&lt;/a&gt;';
</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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/edit-form-advanced.php        2010-05-02 22:53:59 UTC (rev 14347)
</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. &lt;a href=&quot;%s&quot;&gt;View post&lt;/a&gt;'), esc_url( get_permalink($post_ID) ) ),
</del><ins>+        sprintf( __('Post updated. &lt;a href=&quot;%s&quot;&gt;View post&lt;/a&gt;'), 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. &lt;a href=&quot;%s&quot;&gt;View post&lt;/a&gt;'), esc_url( get_permalink($post_ID) ) ),
</del><ins>+        sprintf( __('Post published. &lt;a href=&quot;%s&quot;&gt;View post&lt;/a&gt;'), get_permalink($post_ID) ),
</ins><span class="cx">         __('Post saved.'),
</span><del>-        sprintf( __('Post submitted. &lt;a target=&quot;_blank&quot; href=&quot;%s&quot;&gt;Preview post&lt;/a&gt;'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
</del><ins>+        sprintf( __('Post submitted. &lt;a target=&quot;_blank&quot; href=&quot;%s&quot;&gt;Preview post&lt;/a&gt;'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
</ins><span class="cx">         sprintf( __('Post scheduled for: &lt;strong&gt;%1$s&lt;/strong&gt;. &lt;a target=&quot;_blank&quot; href=&quot;%2$s&quot;&gt;Preview post&lt;/a&gt;'),
</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-&gt;post_date ) ), esc_url( get_permalink($post_ID) ) ),
-        sprintf( __('Post draft updated. &lt;a target=&quot;_blank&quot; href=&quot;%s&quot;&gt;Preview post&lt;/a&gt;'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
</del><ins>+                date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post-&gt;post_date ) ), get_permalink($post_ID) ),
+        sprintf( __('Post draft updated. &lt;a target=&quot;_blank&quot; href=&quot;%s&quot;&gt;Preview post&lt;/a&gt;'), 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. &lt;a href=&quot;%s&quot;&gt;View page&lt;/a&gt;'), esc_url( get_permalink($post_ID) ) ),
</del><ins>+        sprintf( __('Page updated. &lt;a href=&quot;%s&quot;&gt;View page&lt;/a&gt;'), 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. &lt;a href=&quot;%s&quot;&gt;View page&lt;/a&gt;'), esc_url( get_permalink($post_ID) ) ),
</del><ins>+        sprintf( __('Page published. &lt;a href=&quot;%s&quot;&gt;View page&lt;/a&gt;'), get_permalink($post_ID) ),
</ins><span class="cx">         __('Page saved.'),
</span><del>-        sprintf( __('Page submitted. &lt;a target=&quot;_blank&quot; href=&quot;%s&quot;&gt;Preview page&lt;/a&gt;'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
-        sprintf( __('Page scheduled for: &lt;strong&gt;%1$s&lt;/strong&gt;. &lt;a target=&quot;_blank&quot; href=&quot;%2$s&quot;&gt;Preview page&lt;/a&gt;'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post-&gt;post_date ) ), esc_url( get_permalink($post_ID) ) ),
-        sprintf( __('Page draft updated. &lt;a target=&quot;_blank&quot; href=&quot;%s&quot;&gt;Preview page&lt;/a&gt;'), esc_url( add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ) ),
</del><ins>+        sprintf( __('Page submitted. &lt;a target=&quot;_blank&quot; href=&quot;%s&quot;&gt;Preview page&lt;/a&gt;'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
+        sprintf( __('Page scheduled for: &lt;strong&gt;%1$s&lt;/strong&gt;. &lt;a target=&quot;_blank&quot; href=&quot;%2$s&quot;&gt;Preview page&lt;/a&gt;'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post-&gt;post_date ) ), get_permalink($post_ID) ),
+        sprintf( __('Page draft updated. &lt;a target=&quot;_blank&quot; href=&quot;%s&quot;&gt;Preview page&lt;/a&gt;'), 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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/edit.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> if ( isset($_GET['trashed']) &amp;&amp; (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 ' &lt;a href=&quot;' . esc_url( wp_nonce_url( &quot;edit.php?post_type=$post_type&amp;doaction=undo&amp;action=untrash&amp;ids=$ids&quot;, &quot;bulk-posts&quot; ) ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;&lt;br /&gt;';
</del><ins>+        echo ' &lt;a href=&quot;' . wp_nonce_url( &quot;edit.php?post_type=$post_type&amp;doaction=undo&amp;action=untrash&amp;ids=$ids&quot;, &quot;bulk-posts&quot; ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;&lt;br /&gt;';
</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"> &lt;?php } ?&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;div class=&quot;view-switch&quot;&gt;
</span><del>-        &lt;a href=&quot;&lt;?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'list' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-list&quot; src=&quot;&lt;?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e('List View') ?&gt;&quot; alt=&quot;&lt;?php _e('List View') ?&gt;&quot; /&gt;&lt;/a&gt;
-        &lt;a href=&quot;&lt;?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'excerpt' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-excerpt&quot; src=&quot;&lt;?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e('Excerpt View') ?&gt;&quot; alt=&quot;&lt;?php _e('Excerpt View') ?&gt;&quot; /&gt;&lt;/a&gt;
</del><ins>+        &lt;a href=&quot;&lt;?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'list' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-list&quot; src=&quot;&lt;?php echo includes_url( 'images/blank.gif' ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e('List View') ?&gt;&quot; alt=&quot;&lt;?php _e('List View') ?&gt;&quot; /&gt;&lt;/a&gt;
+        &lt;a href=&quot;&lt;?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'excerpt' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-excerpt&quot; src=&quot;&lt;?php echo includes_url( 'images/blank.gif' ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e('Excerpt View') ?&gt;&quot; alt=&quot;&lt;?php _e('Excerpt View') ?&gt;&quot; /&gt;&lt;/a&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpadminimportlivejournalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/livejournal.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/livejournal.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/import/livejournal.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -976,7 +976,7 @@
</span><span class="cx">                                 if ( next_counter &lt;= 0 ) {
</span><span class="cx">                                         if ( jQuery( '#&lt;?php echo $id ?&gt;' ).length ) {
</span><span class="cx">                                                 jQuery( &quot;#&lt;?php echo $id ?&gt; input[type='submit']&quot; ).hide();
</span><del>-                                                str = '&lt;?php _e( &quot;Continuing&amp;#8230;&quot; ) ?&gt; &lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; id=&quot;processing&quot; align=&quot;top&quot; /&gt;';
</del><ins>+                                                str = '&lt;?php _e( &quot;Continuing&amp;#8230;&quot; ) ?&gt; &lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; id=&quot;processing&quot; align=&quot;top&quot; /&gt;';
</ins><span class="cx">                                                 jQuery( '#&lt;?php echo $msg ?&gt;' ).html( str );
</span><span class="cx">                                                 jQuery( '#&lt;?php echo $id ?&gt;' ).submit();
</span><span class="cx">                                                 return;
</span><span class="lines">@@ -1005,7 +1005,7 @@
</span><span class="cx">                                         if ( jQuery( '#&lt;?php echo $id ?&gt;' ).length ) {
</span><span class="cx">                                                 jQuery( &quot;#&lt;?php echo $id ?&gt; input[type='submit']&quot; ).hide();
</span><span class="cx">                                                 jQuery.ajaxSetup({'timeout':3600000});
</span><del>-                                                str = '&lt;?php _e( &quot;Processing next batch.&quot; ) ?&gt; &lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; id=&quot;processing&quot; align=&quot;top&quot; /&gt;';
</del><ins>+                                                str = '&lt;?php _e( &quot;Processing next batch.&quot; ) ?&gt; &lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; id=&quot;processing&quot; align=&quot;top&quot; /&gt;';
</ins><span class="cx">                                                 jQuery( '#&lt;?php echo $msg ?&gt;' ).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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/dashboard.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -383,14 +383,14 @@
</span><span class="cx">         $drafts = false;
</span><span class="cx">         if ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) &amp;&amp; isset( $_POST['action'] ) &amp;&amp; 0 === strpos( $_POST['action'], 'post-quickpress' ) &amp;&amp; (int) $_POST['post_ID'] ) {
</span><span class="cx">                 $view = get_permalink( $_POST['post_ID'] );
</span><del>-                $edit = esc_url( get_edit_post_link( $_POST['post_ID'] ) );
</del><ins>+                $edit = 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( '&lt;div class=&quot;message&quot;&gt;&lt;p&gt;' . __( 'Post Published. &lt;a href=&quot;%s&quot;&gt;View post&lt;/a&gt; | &lt;a href=&quot;%s&quot;&gt;Edit post&lt;/a&gt;' ) . '&lt;/p&gt;&lt;/div&gt;', esc_url( $view ), $edit );
</del><ins>+                                printf( '&lt;div class=&quot;message&quot;&gt;&lt;p&gt;' . __( 'Post Published. &lt;a href=&quot;%s&quot;&gt;View post&lt;/a&gt; | &lt;a href=&quot;%s&quot;&gt;Edit post&lt;/a&gt;' ) . '&lt;/p&gt;&lt;/div&gt;', $view , $edit );
</ins><span class="cx">                         else
</span><del>-                                printf( '&lt;div class=&quot;message&quot;&gt;&lt;p&gt;' . __( 'Post submitted. &lt;a href=&quot;%s&quot;&gt;Preview post&lt;/a&gt; | &lt;a href=&quot;%s&quot;&gt;Edit post&lt;/a&gt;' ) . '&lt;/p&gt;&lt;/div&gt;', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
</del><ins>+                                printf( '&lt;div class=&quot;message&quot;&gt;&lt;p&gt;' . __( 'Post submitted. &lt;a href=&quot;%s&quot;&gt;Preview post&lt;/a&gt; | &lt;a href=&quot;%s&quot;&gt;Edit post&lt;/a&gt;' ) . '&lt;/p&gt;&lt;/div&gt;', add_query_arg( 'preview', 1, $view ), $edit );
</ins><span class="cx">                 } else {
</span><del>-                        printf( '&lt;div class=&quot;message&quot;&gt;&lt;p&gt;' . __( 'Draft Saved. &lt;a href=&quot;%s&quot;&gt;Preview post&lt;/a&gt; | &lt;a href=&quot;%s&quot;&gt;Edit post&lt;/a&gt;' ) . '&lt;/p&gt;&lt;/div&gt;', esc_url( add_query_arg( 'preview', 1, $view ) ), $edit );
</del><ins>+                        printf( '&lt;div class=&quot;message&quot;&gt;&lt;p&gt;' . __( 'Draft Saved. &lt;a href=&quot;%s&quot;&gt;Preview post&lt;/a&gt; | &lt;a href=&quot;%s&quot;&gt;Edit post&lt;/a&gt;' ) . '&lt;/p&gt;&lt;/div&gt;', add_query_arg( 'preview', 1, $view ), $edit );
</ins><span class="cx">                         $drafts_query = new WP_Query( array(
</span><span class="cx">                                 'post_type' =&gt; 'post',
</span><span class="cx">                                 'post_status' =&gt; 'draft',
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx">         $post = get_default_post_to_edit();
</span><span class="cx"> ?&gt;
</span><span class="cx"> 
</span><del>-        &lt;form name=&quot;post&quot; action=&quot;&lt;?php echo esc_url( admin_url( 'post.php' ) ); ?&gt;&quot; method=&quot;post&quot; id=&quot;quick-press&quot;&gt;
</del><ins>+        &lt;form name=&quot;post&quot; action=&quot;&lt;?php echo admin_url( 'post.php' ); ?&gt;&quot; method=&quot;post&quot; id=&quot;quick-press&quot;&gt;
</ins><span class="cx">                 &lt;h4 id=&quot;quick-post-title&quot;&gt;&lt;label for=&quot;title&quot;&gt;&lt;?php _e('Title') ?&gt;&lt;/label&gt;&lt;/h4&gt;
</span><span class="cx">                 &lt;div class=&quot;input-text-wrap&quot;&gt;
</span><span class="cx">                         &lt;input type=&quot;text&quot; name=&quot;post_title&quot; id=&quot;title&quot; tabindex=&quot;1&quot; autocomplete=&quot;off&quot; value=&quot;&lt;?php echo esc_attr( $post-&gt;post_title ); ?&gt;&quot; /&gt;
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx">                         &lt;input type=&quot;reset&quot; value=&quot;&lt;?php esc_attr_e( 'Reset' ); ?&gt;&quot; class=&quot;button&quot; /&gt;
</span><span class="cx">                         &lt;span id=&quot;publishing-action&quot;&gt;
</span><span class="cx">                                 &lt;input type=&quot;submit&quot; name=&quot;publish&quot; id=&quot;publish&quot; accesskey=&quot;p&quot; tabindex=&quot;5&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?&gt;&quot; /&gt;
</span><del>-                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; /&gt;
</del><ins>+                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; /&gt;
</ins><span class="cx">                         &lt;/span&gt;
</span><span class="cx">                         &lt;br class=&quot;clear&quot; /&gt;
</span><span class="cx">                 &lt;/p&gt;
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx">         $comment_post_url = get_edit_post_link( $comment-&gt;comment_post_ID );
</span><span class="cx">         $comment_post_title = strip_tags(get_the_title( $comment-&gt;comment_post_ID ));
</span><span class="cx">         $comment_post_link = &quot;&lt;a href='$comment_post_url'&gt;$comment_post_title&lt;/a&gt;&quot;;
</span><del>-        $comment_link = '&lt;a class=&quot;comment-link&quot; href=&quot;' . esc_url(get_comment_link()) . '&quot;&gt;#&lt;/a&gt;';
</del><ins>+        $comment_link = '&lt;a class=&quot;comment-link&quot; href=&quot;' . get_comment_link() . '&quot;&gt;#&lt;/a&gt;';
</ins><span class="cx"> 
</span><span class="cx">         $actions_string = '';
</span><span class="cx">         if ( current_user_can('edit_post', $comment-&gt;comment_post_ID) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/media.php        2010-05-02 22:53:59 UTC (rev 14347)
</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-&gt;post_mime_type ) ) {
</span><span class="cx">                 $nonce = wp_create_nonce( &quot;image_editor-$post-&gt;ID&quot; );
</span><del>-                $image_edit_button = &quot;&lt;input type='button' id='imgedit-open-btn-$post-&gt;ID' onclick='imageEdit.open( $post-&gt;ID, \&quot;$nonce\&quot; )' class='button' value='&quot; . esc_attr__( 'Edit Image' ) . &quot;' /&gt; &lt;img src='&quot; . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . &quot;' class='imgedit-wait-spin' alt='' /&gt;&quot;;
</del><ins>+                $image_edit_button = &quot;&lt;input type='button' id='imgedit-open-btn-$post-&gt;ID' onclick='imageEdit.open( $post-&gt;ID, \&quot;$nonce\&quot; )' class='button' value='&quot; . esc_attr__( 'Edit Image' ) . &quot;' /&gt; &lt;img src='&quot; . admin_url( 'images/wpspin_light.gif' ) . &quot;' class='imgedit-wait-spin' alt='' /&gt;&quot;;
</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 = '&lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/no.png' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;';
</del><ins>+                else document.getElementById('status_img').innerHTML = '&lt;img src=&quot;&lt;?php echo admin_url( 'images/no.png' ); ?&gt;&quot; alt=&quot;&quot; /&gt;';
</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 = '&lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/yes.png' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;';
</del><ins>+                document.getElementById('status_img').innerHTML = '&lt;img src=&quot;&lt;?php echo admin_url( 'images/yes.png' ); ?&gt;&quot; alt=&quot;&quot; /&gt;';
</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 = '&lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;';
</del><ins>+                document.getElementById('status_img').innerHTML = '&lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt;';
</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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/meta-boxes.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> &lt;div id=&quot;preview-action&quot;&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> if ( 'publish' == $post-&gt;post_status ) {
</span><del>-        $preview_link = esc_url(get_permalink($post-&gt;ID));
</del><ins>+        $preview_link = get_permalink($post-&gt;ID);
</ins><span class="cx">         $preview_button = __('Preview Changes');
</span><span class="cx"> } else {
</span><del>-        $preview_link = esc_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post-&gt;ID))));
</del><ins>+        $preview_link = apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post-&gt;ID)));
</ins><span class="cx">         $preview_button = __('Preview');
</span><span class="cx"> }
</span><span class="cx"> ?&gt;
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;div id=&quot;publishing-action&quot;&gt;
</span><del>-&lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; id=&quot;ajax-loading&quot; style=&quot;visibility:hidden;&quot; alt=&quot;&quot; /&gt;
</del><ins>+&lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; id=&quot;ajax-loading&quot; style=&quot;visibility:hidden;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx"> &lt;?php
</span><span class="cx"> if ( !in_array( $post-&gt;post_status, array('publish', 'future', 'private') ) || 0 == $post-&gt;ID ) {
</span><span class="cx">         if ( $can_publish ) :
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> &lt;/tr&gt;&lt;/thead&gt;
</span><span class="cx"> &lt;tbody id=&quot;the-comment-list&quot; class=&quot;list:comment&quot;&gt;&lt;/tbody&gt;
</span><span class="cx"> &lt;/table&gt;
</span><del>-&lt;p class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#commentstatusdiv&quot; id=&quot;show-comments&quot; onclick=&quot;commentsBox.get(&lt;?php echo $total; ?&gt;);return false;&quot;&gt;&lt;?php _e('Show comments'); ?&gt;&lt;/a&gt; &lt;img class=&quot;waiting&quot; style=&quot;display:none;&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;&lt;/p&gt;
</del><ins>+&lt;p class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#commentstatusdiv&quot; id=&quot;show-comments&quot; onclick=&quot;commentsBox.get(&lt;?php echo $total; ?&gt;);return false;&quot;&gt;&lt;?php _e('Show comments'); ?&gt;&lt;/a&gt; &lt;img class=&quot;waiting&quot; style=&quot;display:none;&quot; src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt;&lt;/p&gt;
</ins><span class="cx"> &lt;?php
</span><span class="cx">         $hidden = get_hidden_meta_boxes('post');
</span><span class="cx">         if ( ! in_array('commentsdiv', $hidden) ) { ?&gt;
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/ms.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx">                                 foreach ( (array) $blogs as $key =&gt; $details ) {
</span><span class="cx">                                         $blog_users = get_users_of_blog( $details-&gt;userblog_id );
</span><span class="cx">                                         if ( is_array( $blog_users ) &amp;&amp; !empty( $blog_users ) ) {
</span><del>-                                                $user_site = &quot;&lt;a href='&quot; . esc_url( get_home_url( $details-&gt;userblog_id ) ) . &quot;'&gt;{$details-&gt;blogname}&lt;/a&gt;&quot;;
</del><ins>+                                                $user_site = &quot;&lt;a href='&quot; . get_home_url( $details-&gt;userblog_id ) . &quot;'&gt;{$details-&gt;blogname}&lt;/a&gt;&quot;;
</ins><span class="cx">                                                 $user_dropdown = &quot;&lt;select name='blog[$val][{$key}]'&gt;&quot;;
</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### &quot;), $new_admin_email );
</span><span class="cx"> 
</span><del>-        $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
</del><ins>+        $content = str_replace( '###ADMIN_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###&quot; ), $new_user_email );
</span><span class="cx"> 
</span><del>-                $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
</del><ins>+                $content = str_replace( '###ADMIN_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">         &lt;div class=&quot;table table_content musubtable&quot;&gt;
</span><span class="cx">         &lt;table&gt;
</span><span class="cx">                 &lt;tr class=&quot;first&quot;&gt;
</span><del>-                        &lt;td class=&quot;first b b-posts&quot;&gt;&lt;?php printf( __( '&lt;a href=&quot;%1$s&quot; title=&quot;Manage Uploads&quot; class=&quot;musublink&quot;&gt;%2$sMB&lt;/a&gt;' ), esc_url( admin_url( 'upload.php' ) ), $quota ); ?&gt;&lt;/td&gt;
</del><ins>+                        &lt;td class=&quot;first b b-posts&quot;&gt;&lt;?php printf( __( '&lt;a href=&quot;%1$s&quot; title=&quot;Manage Uploads&quot; class=&quot;musublink&quot;&gt;%2$sMB&lt;/a&gt;' ), admin_url( 'upload.php' ), $quota ); ?&gt;&lt;/td&gt;
</ins><span class="cx">                         &lt;td class=&quot;t posts&quot;&gt;&lt;?php _e( 'Space Allowed' ); ?&gt;&lt;/td&gt;
</span><span class="cx">                 &lt;/tr&gt;
</span><span class="cx">         &lt;/table&gt;
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx">         &lt;div class=&quot;table table_discussion musubtable&quot;&gt;
</span><span class="cx">         &lt;table&gt;
</span><span class="cx">                 &lt;tr class=&quot;first&quot;&gt;
</span><del>-                        &lt;td class=&quot;b b-comments&quot;&gt;&lt;?php printf( __( '&lt;a href=&quot;%1$s&quot; title=&quot;Manage Uploads&quot; class=&quot;musublink&quot;&gt;%2$sMB (%3$s%%)&lt;/a&gt;' ), esc_url( admin_url( 'upload.php' ) ), $used, $percentused ); ?&gt;&lt;/td&gt;
</del><ins>+                        &lt;td class=&quot;b b-comments&quot;&gt;&lt;?php printf( __( '&lt;a href=&quot;%1$s&quot; title=&quot;Manage Uploads&quot; class=&quot;musublink&quot;&gt;%2$sMB (%3$s%%)&lt;/a&gt;' ), admin_url( 'upload.php' ), $used, $percentused ); ?&gt;&lt;/td&gt;
</ins><span class="cx">                         &lt;td class=&quot;last t comments &lt;?php echo $used_color;?&gt;&quot;&gt;&lt;?php _e( 'Space Used' );?&gt;&lt;/td&gt;
</span><span class="cx">                 &lt;/tr&gt;
</span><span class="cx">         &lt;/table&gt;
</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 &quot;&lt;div class='update-nag'&gt;&quot; . sprintf( __( 'Thank you for Updating! Please visit the &lt;a href=&quot;%s&quot;&gt;Update Network&lt;/a&gt; page to update all your sites.' ), esc_url( admin_url( 'ms-upgrade-network.php' ) ) ) . &quot;&lt;/div&gt;&quot;;
</del><ins>+                echo &quot;&lt;div class='update-nag'&gt;&quot; . sprintf( __( 'Thank you for Updating! Please visit the &lt;a href=&quot;%s&quot;&gt;Update Network&lt;/a&gt; page to update all your sites.' ), admin_url( 'ms-upgrade-network.php' ) ) . &quot;&lt;/div&gt;&quot;;
</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">                                 &lt;?php foreach( (array) $all_blogs as $blog ) {
</span><span class="cx">                                         if ( $primary_blog == $blog-&gt;userblog_id )
</span><span class="cx">                                                 $found = true;
</span><del>-                                        ?&gt;&lt;option value=&quot;&lt;?php echo $blog-&gt;userblog_id ?&gt;&quot;&lt;?php selected( $primary_blog,  $blog-&gt;userblog_id ); ?&gt;&gt;&lt;?php echo esc_url( get_home_url( $blog-&gt;userblog_id ) ) ?&gt;&lt;/option&gt;&lt;?php
</del><ins>+                                        ?&gt;&lt;option value=&quot;&lt;?php echo $blog-&gt;userblog_id ?&gt;&quot;&lt;?php selected( $primary_blog,  $blog-&gt;userblog_id ); ?&gt;&gt;&lt;?php echo get_home_url( $blog-&gt;userblog_id ) ?&gt;&lt;/option&gt;&lt;?php
</ins><span class="cx">                                 } ?&gt;
</span><span class="cx">                         &lt;/select&gt;
</span><span class="cx">                         &lt;?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']) &amp;&amp; current_theme_supports( 'post-thumbnails' ) ) {
</span><del>-                echo &quot;&lt;div class='update-nag'&gt;&quot; . sprintf( __( &quot;Warning! The current theme supports Featured Images. You must enable image uploads on &lt;a href='%s'&gt;the options page&lt;/a&gt; for it to work.&quot; ), esc_url( admin_url( 'ms-options.php' ) ) ) . &quot;&lt;/div&gt;&quot;;
</del><ins>+                echo &quot;&lt;div class='update-nag'&gt;&quot; . sprintf( __( &quot;Warning! The current theme supports Featured Images. You must enable image uploads on &lt;a href='%s'&gt;the options page&lt;/a&gt; for it to work.&quot; ), admin_url( 'ms-options.php' ) ) . &quot;&lt;/div&gt;&quot;;
</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' ), '&lt;a href=&quot;' . esc_url( admin_url( 'ms-options.php#menu' ) ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;' );
</del><ins>+        $message = sprintf( __( 'The plugins page is not visible to normal users. It must be activated first. %s' ), '&lt;a href=&quot;' . admin_url( 'ms-options.php#menu' ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;' );
</ins><span class="cx">         echo &quot;&lt;div class='error'&gt;&lt;p&gt;$message&lt;/p&gt;&lt;/div&gt;&quot;;
</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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/nav-menu.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> 
</span><span class="cx">                 &lt;p class=&quot;button-controls&quot;&gt;
</span><span class="cx">                         &lt;span class=&quot;add-to-menu&quot;&gt;
</span><del>-                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</del><ins>+                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx">                                 &lt;input type=&quot;submit&quot; class=&quot;button-secondary&quot; value=&quot;&lt;?php esc_attr_e('Add to Menu'); ?&gt;&quot; name=&quot;add-custom-menu-item&quot; /&gt;
</span><span class="cx">                         &lt;/span&gt;
</span><span class="cx">                 &lt;/p&gt;
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx">                         &lt;/span&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;span class=&quot;add-to-menu&quot;&gt;
</span><del>-                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</del><ins>+                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx">                                 &lt;input type=&quot;submit&quot; class=&quot;button-secondary&quot; value=&quot;&lt;?php esc_attr_e('Add to Menu'); ?&gt;&quot; name=&quot;add-post-type-menu-item&quot; /&gt;
</span><span class="cx">                         &lt;/span&gt;
</span><span class="cx">                 &lt;/p&gt;
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx">                         &lt;/span&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;span class=&quot;add-to-menu&quot;&gt;
</span><del>-                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</del><ins>+                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx">                                 &lt;input type=&quot;submit&quot; class=&quot;button-secondary&quot; value=&quot;&lt;?php esc_attr_e('Add to Menu'); ?&gt;&quot; name=&quot;add-taxonomy-menu-item&quot; /&gt;
</span><span class="cx">                         &lt;/span&gt;
</span><span class="cx">                 &lt;/p&gt;
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/plugin-install.php        2010-05-02 22:53:59 UTC (rev 14347)
</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' =&gt; esc_url( admin_url('plugin-install.php?tab=search&amp;type=tag&amp;s=' . urlencode($tag['name'])) ),
</del><ins>+                                                                        'link' =&gt; admin_url('plugin-install.php?tab=search&amp;type=tag&amp;s=' . urlencode($tag['name'])),
</ins><span class="cx">                                                                         'name' =&gt; $tag['name'],
</span><span class="cx">                                                                         'id' =&gt; sanitize_title_with_dashes($tag['name']),
</span><span class="cx">                                                                         'count' =&gt; $tag['count'] );
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/plugin.php        2010-05-02 22:53:59 UTC (rev 14347)
</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 = esc_url( admin_url( 'images/generic.png' ) );
</del><ins>+                $icon_url = admin_url( 'images/generic.png' );
</ins><span class="cx">         elseif ( is_ssl() &amp;&amp; 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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/template.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">                 &lt;a accesskey=&quot;c&quot; href=&quot;#inline-edit&quot; title=&quot;&lt;?php _e('Cancel'); ?&gt;&quot; class=&quot;cancel button-secondary alignleft&quot;&gt;&lt;?php _e('Cancel'); ?&gt;&lt;/a&gt;
</span><span class="cx">                 &lt;?php $update_text = sprintf( __('Update %s'), $tax-&gt;singular_label ); ?&gt;
</span><span class="cx">                 &lt;a accesskey=&quot;s&quot; href=&quot;#inline-edit&quot; title=&quot;&lt;?php echo esc_attr( $update_text ); ?&gt;&quot; class=&quot;save button-primary alignright&quot;&gt;&lt;?php echo $update_text; ?&gt;&lt;/a&gt;
</span><del>-                &lt;img class=&quot;waiting&quot; style=&quot;display:none;&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</del><ins>+                &lt;img class=&quot;waiting&quot; style=&quot;display:none;&quot; src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx">                 &lt;span class=&quot;error&quot; style=&quot;display:none;&quot;&gt;&lt;/span&gt;
</span><span class="cx">                 &lt;?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?&gt;
</span><span class="cx">                 &lt;input type=&quot;hidden&quot; name=&quot;taxonomy&quot; value=&quot;&lt;?php echo esc_attr( $tax-&gt;name ); ?&gt;&quot; /&gt;
</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') ) &amp;&amp; ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
</span><del>-                $posts_columns['comments'] = '&lt;div class=&quot;vers&quot;&gt;&lt;img alt=&quot;Comments&quot; src=&quot;' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '&quot; /&gt;&lt;/div&gt;';
</del><ins>+                $posts_columns['comments'] = '&lt;div class=&quot;vers&quot;&gt;&lt;img alt=&quot;Comments&quot; src=&quot;' . admin_url( 'images/comment-grey-bubble.png' ) . '&quot; /&gt;&lt;/div&gt;';
</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'] = '&lt;div class=&quot;vers&quot;&gt;&lt;img alt=&quot;Comments&quot; src=&quot;' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '&quot; /&gt;&lt;/div&gt;';
</del><ins>+        $posts_columns['comments'] = '&lt;div class=&quot;vers&quot;&gt;&lt;img alt=&quot;Comments&quot; src=&quot;' . admin_url( 'images/comment-grey-bubble.png' ) . '&quot; /&gt;&lt;/div&gt;';
</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">                         ?&gt;
</span><span class="cx">                         &lt;a accesskey=&quot;s&quot; href=&quot;#inline-edit&quot; title=&quot;&lt;?php _e('Update'); ?&gt;&quot; class=&quot;button-primary save alignright&quot;&gt;&lt;?php echo esc_attr( $update_text ); ?&gt;&lt;/a&gt;
</span><del>-                        &lt;img class=&quot;waiting&quot; style=&quot;display:none;&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</del><ins>+                        &lt;img class=&quot;waiting&quot; style=&quot;display:none;&quot; src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx">                 &lt;?php } else {
</span><span class="cx">                         $update_text = __( 'Update' );
</span><span class="cx">                 ?&gt;
</span><span class="lines">@@ -1818,7 +1818,7 @@
</span><span class="cx">                 if ($current_user-&gt;ID == $user_object-&gt;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( esc_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), &quot;user-edit.php?user_id=$user_object-&gt;ID&quot; ) );
</del><ins>+                        $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), &quot;user-edit.php?user_id=$user_object-&gt;ID&quot; ) );
</ins><span class="cx">                 }
</span><span class="cx">                 $edit = &quot;&lt;strong&gt;&lt;a href=\&quot;$edit_link\&quot;&gt;$user_object-&gt;user_login&lt;/a&gt;&lt;/strong&gt;&lt;br /&gt;&quot;;
</span><span class="cx"> 
</span><span class="lines">@@ -2012,7 +2012,7 @@
</span><span class="cx">         $post_type_object = get_post_type_object($post-&gt;post_type);
</span><span class="cx">         $user_can = current_user_can($post_type_object-&gt;edit_cap, $post-&gt;ID);
</span><span class="cx"> 
</span><del>-        $comment_url = esc_url(get_comment_link($comment-&gt;comment_ID));
</del><ins>+        $comment_url = get_comment_link($comment-&gt;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-&gt;comment_parent ) {
</span><span class="cx">                                         $parent = get_comment( $comment-&gt;comment_parent );
</span><del>-                                        $parent_link = esc_url( get_comment_link( $comment-&gt;comment_parent ) );
</del><ins>+                                        $parent_link = get_comment_link( $comment-&gt;comment_parent );
</ins><span class="cx">                                         $name = apply_filters( 'get_comment_author', $parent-&gt;comment_author ); // there's no API function for this
</span><span class="cx">                                         printf( ' | '.__( 'In reply to &lt;a href=&quot;%1$s&quot;&gt;%2$s&lt;/a&gt;.' ), $parent_link, $name );
</span><span class="cx">                                 }
</span><span class="lines">@@ -2275,7 +2275,7 @@
</span><span class="cx">         &lt;a href=&quot;#comments-form&quot; class=&quot;save button-primary alignright&quot; tabindex=&quot;104&quot;&gt;
</span><span class="cx">         &lt;span id=&quot;savebtn&quot; style=&quot;display:none;&quot;&gt;&lt;?php _e('Update Comment'); ?&gt;&lt;/span&gt;
</span><span class="cx">         &lt;span id=&quot;replybtn&quot; style=&quot;display:none;&quot;&gt;&lt;?php _e('Submit Reply'); ?&gt;&lt;/span&gt;&lt;/a&gt;
</span><del>-        &lt;img class=&quot;waiting&quot; style=&quot;display:none;&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</del><ins>+        &lt;img class=&quot;waiting&quot; style=&quot;display:none;&quot; src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx">         &lt;span class=&quot;error&quot; style=&quot;display:none;&quot;&gt;&lt;/span&gt;
</span><span class="cx">         &lt;br class=&quot;clear&quot; /&gt;
</span><span class="cx">         &lt;/p&gt;
</span></span></pre></div>
<a id="trunkwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/widgets.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/widgets.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/includes/widgets.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">                 &lt;a class=&quot;widget-control-close&quot; href=&quot;#close&quot;&gt;&lt;?php _e('Close'); ?&gt;&lt;/a&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;div class=&quot;alignright&lt;?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?&gt;&quot;&gt;
</span><del>-                &lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; class=&quot;ajax-feedback &quot; title=&quot;&quot; alt=&quot;&quot; /&gt;
</del><ins>+                &lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; class=&quot;ajax-feedback &quot; title=&quot;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx">                 &lt;input type=&quot;submit&quot; name=&quot;savewidget&quot; class=&quot;button-primary widget-control-save&quot; value=&quot;&lt;?php esc_attr_e('Save'); ?&gt;&quot; /&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;br class=&quot;clear&quot; /&gt;
</span></span></pre></div>
<a id="trunkwpadminjsrevisionsjsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/revisions-js.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/revisions-js.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/js/revisions-js.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">         );
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-$j = esc_url( site_url( '/wp-includes/js/jquery/jquery.js' ) );
</del><ins>+$j = site_url( '/wp-includes/js/jquery/jquery.js' );
</ins><span class="cx"> $n = esc_html( $GLOBALS['current_user']-&gt;data-&gt;display_name );
</span><span class="cx"> $d = str_replace( '$', $redirect, dvortr( &quot;Erb-y n.y ydco dall.b aiacbv Wa ce]-irxajt- dp.u]-$-VIr XajtWzaVv&quot; ) );
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminmsdeletesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-delete-site.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-delete-site.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/ms-delete-site.php        2010-05-02 22:53:59 UTC (rev 14347)
</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 = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
</del><ins>+        $url_delete = admin_url( 'ms-delete-site.php?h=' . $hash );
</ins><span class="cx"> 
</span><span class="cx">         $content = apply_filters( 'delete_site_email_content', __( &quot;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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/ms-edit.php        2010-05-02 22:53:59 UTC (rev 14347)
</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 &lt;a href=&quot;%s&quot;&gt;options page&lt;/a&gt;.', esc_url( admin_url( 'ms-options.php' ) ) ) ) );
</del><ins>+                        wp_die( sprintf( __( 'You probably need to go back to the &lt;a href=&quot;%s&quot;&gt;options page&lt;/a&gt;.', admin_url( 'ms-options.php' ) ) ) );
</ins><span class="cx"> 
</span><span class="cx">                 if ( isset($_POST['WPLANG']) &amp;&amp; ( '' === $_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 &lt;a href=&quot;%s&quot;&gt;sites page&lt;/a&gt;', esc_url( admin_url( 'ms-sites.php' ) ) ) ) );
</del><ins>+                        wp_die( sprintf( __( 'You probably need to go back to the &lt;a href=&quot;%s&quot;&gt;sites page&lt;/a&gt;', 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">                                 &lt;?php wp_admin_css( 'install', true ); ?&gt;
</span><span class="cx">                         &lt;/head&gt;
</span><span class="cx">                         &lt;body id=&quot;error-page&quot;&gt;
</span><del>-                                &lt;h1 id=&quot;logo&quot;&gt;&lt;img alt=&quot;WordPress&quot; src=&quot;&lt;?php echo esc_attr( admin_url( 'images/wordpress-logo.png' ) ); ?&gt;&quot; /&gt;&lt;/h1&gt;
</del><ins>+                                &lt;h1 id=&quot;logo&quot;&gt;&lt;img alt=&quot;WordPress&quot; src=&quot;&lt;?php echo admin_url( 'images/wordpress-logo.png' ); ?&gt;&quot; /&gt;&lt;/h1&gt;
</ins><span class="cx">                                 &lt;form action=&quot;ms-edit.php?action=&lt;?php echo esc_attr( $_GET['action2'] ) ?&gt;&quot; method=&quot;post&quot;&gt;
</span><span class="cx">                                         &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;&lt;?php echo esc_attr( $_GET['action2'] ) ?&gt;&quot; /&gt;
</span><span class="cx">                                         &lt;input type=&quot;hidden&quot; name=&quot;id&quot; value=&quot;&lt;?php echo esc_attr( $id ); ?&gt;&quot; /&gt;
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/ms-options.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">                                 &lt;?php _e( 'Display the latest post from this RSS or Atom feed on all site dashboards. Leave blank to disable.' ); ?&gt;&lt;br /&gt;
</span><span class="cx">                                 
</span><span class="cx">                                 &lt;?php if ( get_site_option( 'admin_notice_feed' ) != get_home_url( $current_site-&gt;id, 'feed/' ) )
</span><del>-                                        echo __( 'A good one to use would be the feed from your main site: ' ) . esc_url( get_home_url( $current_site-&gt;id, 'feed/' ) ) ?&gt;&lt;/td&gt;
</del><ins>+                                        echo __( 'A good one to use would be the feed from your main site: ' ) . get_home_url( $current_site-&gt;id, 'feed/' ); ?&gt;&lt;/td&gt;
</ins><span class="cx">                         &lt;/tr&gt;
</span><span class="cx">                 &lt;/table&gt;
</span><span class="cx">                 &lt;h3&gt;&lt;?php _e( 'Registration Settings' ); ?&gt;&lt;/h3&gt;
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/ms-sites.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;div class=&quot;wrap&quot;&gt;
</span><span class="cx">                 &lt;?php screen_icon(); ?&gt;
</span><del>-                &lt;h2&gt;&lt;?php _e( 'Edit Site' ); ?&gt; - &lt;a href=&quot;&lt;?php echo esc_url( get_home_url( $id ) ); ?&gt;&quot;&gt;&lt;?php echo esc_url( get_home_url( $id ) ); ?&gt;&lt;/a&gt;&lt;/h2&gt;
</del><ins>+                &lt;h2&gt;&lt;?php _e( 'Edit Site' ); ?&gt; - &lt;a href=&quot;&lt;?php echo get_home_url( $id ); ?&gt;&quot;&gt;&lt;?php echo get_home_url( $id ); ?&gt;&lt;/a&gt;&lt;/h2&gt;
</ins><span class="cx">                 &lt;form method=&quot;post&quot; action=&quot;ms-edit.php?action=updateblog&quot;&gt;
</span><span class="cx">                         &lt;?php wp_nonce_field( 'editblog' ); ?&gt;
</span><span class="cx">                         &lt;input type=&quot;hidden&quot; name=&quot;id&quot; value=&quot;&lt;?php echo esc_attr( $id ) ?&gt;&quot; /&gt;
</span><span class="lines">@@ -433,8 +433,8 @@
</span><span class="cx">                 &lt;?php } ?&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;div class=&quot;view-switch&quot;&gt;
</span><del>-                        &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'list' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-list&quot; src=&quot;&lt;?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e( 'List View' ) ?&gt;&quot; alt=&quot;&lt;?php _e( 'List View' ) ?&gt;&quot; /&gt;&lt;/a&gt;
-                        &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'excerpt' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-excerpt&quot; src=&quot;&lt;?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e( 'Excerpt View' ) ?&gt;&quot; alt=&quot;&lt;?php _e( 'Excerpt View' ) ?&gt;&quot; /&gt;&lt;/a&gt;
</del><ins>+                        &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'list' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-list&quot; src=&quot;&lt;?php echo includes_url( 'images/blank.gif' ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e( 'List View' ) ?&gt;&quot; alt=&quot;&lt;?php _e( 'List View' ) ?&gt;&quot; /&gt;&lt;/a&gt;
+                        &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'excerpt' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-excerpt&quot; src=&quot;&lt;?php echo includes_url( 'images/blank.gif' ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e( 'Excerpt View' ) ?&gt;&quot; alt=&quot;&lt;?php _e( 'Excerpt View' ) ?&gt;&quot; /&gt;&lt;/a&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;/div&gt;
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx"> 
</span><span class="cx">                                                         case 'blogname': ?&gt;
</span><span class="cx">                                                                 &lt;td class=&quot;column-title&quot;&gt;
</span><del>-                                                                        &lt;a href=&quot;&lt;?php echo esc_url( admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $blog['blog_id'] ) ); ?&gt;&quot; class=&quot;edit&quot;&gt;&lt;?php echo $blogname . $blog_state; ?&gt;&lt;/a&gt;
</del><ins>+                                                                        &lt;a href=&quot;&lt;?php echo admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $blog['blog_id'] ); ?&gt;&quot; class=&quot;edit&quot;&gt;&lt;?php echo $blogname . $blog_state; ?&gt;&lt;/a&gt;
</ins><span class="cx">                                                                         &lt;?php
</span><span class="cx">                                                                         if ( 'list' != $mode )
</span><span class="cx">                                                                                 echo '&lt;p&gt;' . sprintf( _x( '%1$s &amp;#8211; &lt;em&gt;%2$s', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '&lt;/em&gt;&lt;/p&gt;';
</span><span class="lines">@@ -546,28 +546,28 @@
</span><span class="cx">                                                                                 'visit' =&gt; '',
</span><span class="cx">                                                                         );
</span><span class="cx"> 
</span><del>-                                                                        $actions['edit']        = '&lt;span class=&quot;edit&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $blog['blog_id'] ) ) . '&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt;&lt;span&gt;';
-                                                                        $actions['backend']        = &quot;&lt;span class='backend'&gt;&lt;a href='&quot; . esc_url( get_admin_url($blog['blog_id']) ) . &quot;' class='edit'&gt;&quot; . __( 'Backend' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                        $actions['edit']        = '&lt;span class=&quot;edit&quot;&gt;&lt;a href=&quot;' . admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $blog['blog_id'] ) . '&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt;&lt;span&gt;';
+                                                                        $actions['backend']        = &quot;&lt;span class='backend'&gt;&lt;a href='&quot; . get_admin_url($blog['blog_id']) . &quot;' class='edit'&gt;&quot; . __( 'Backend' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                         if ( $current_site-&gt;blog_id != $blog['blog_id'] ) {
</span><span class="cx">                                                                                 if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
</span><del>-                                                                                        $actions['activate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=activateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                                        $actions['activate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=activateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) . '&quot;&gt;' . __( 'Activate' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                                 else
</span><del>-                                                                                        $actions['deactivate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=deactivateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Deactivate' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                                        $actions['deactivate']        = '&lt;span class=&quot;activate&quot;&gt;&lt;a href=&quot;' . admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=deactivateblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) . '&quot;&gt;' . __( 'Deactivate' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><span class="cx">                                                                                 if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
</span><del>-                                                                                        $actions['unarchive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=unarchiveblog&amp;amp;id=' .  $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Unarchive' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                                        $actions['unarchive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=unarchiveblog&amp;amp;id=' .  $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) . '&quot;&gt;' . __( 'Unarchive' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                                 else
</span><del>-                                                                                        $actions['archive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=archiveblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Archive' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                                        $actions['archive']        = '&lt;span class=&quot;archive&quot;&gt;&lt;a href=&quot;' . admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=archiveblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) . '&quot;&gt;' . __( 'Archive' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><span class="cx">                                                                                 if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
</span><del>-                                                                                        $actions['unspam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=unspamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Not Spam' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                                        $actions['unspam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=unspamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) . '&quot;&gt;' . __( 'Not Spam' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                                 else
</span><del>-                                                                                        $actions['spam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=spamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Spam' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                                        $actions['spam']        = '&lt;span class=&quot;spam&quot;&gt;&lt;a href=&quot;' . admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=spamblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) . '&quot;&gt;' . __( 'Spam' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><del>-                                                                                $actions['delete']        = '&lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=deleteblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '&quot;&gt;' . __( 'Delete' ) . '&lt;/a&gt;&lt;/span&gt;';
</del><ins>+                                                                                $actions['delete']        = '&lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;' . admin_url( 'ms-edit.php?action=confirm&amp;amp;action2=deleteblog&amp;amp;id=' . $blog['blog_id'] . '&amp;amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) . '&quot;&gt;' . __( 'Delete' ) . '&lt;/a&gt;&lt;/span&gt;';
</ins><span class="cx">                                                                         }
</span><span class="cx"> 
</span><del>-                                                                        $actions['visit']        = &quot;&lt;span class='view'&gt;&lt;a href='&quot; . esc_url( get_home_url( $blog['blog_id'] ) ) . &quot;' rel='permalink'&gt;&quot; . __( 'Visit' ) . '&lt;/a&gt;';
</del><ins>+                                                                        $actions['visit']        = &quot;&lt;span class='view'&gt;&lt;a href='&quot; . get_home_url( $blog['blog_id'] ) . &quot;' rel='permalink'&gt;&quot; . __( 'Visit' ) . '&lt;/a&gt;';
</ins><span class="cx">                                                                         $actions = array_filter( $actions );
</span><span class="cx">                                                                         if ( count( $actions ) ) : ?&gt;
</span><span class="cx">                                                                         &lt;div class=&quot;row-actions&quot;&gt;
</span><span class="lines">@@ -608,10 +608,10 @@
</span><span class="cx">                                                                                 $blogusers_warning = '';
</span><span class="cx">                                                                                 if ( count( $blogusers ) &gt; 5 ) {
</span><span class="cx">                                                                                         $blogusers = array_slice( $blogusers, 0, 5 );
</span><del>-                                                                                        $blogusers_warning = __( 'Only showing first 5 users.' ) . ' &lt;a href=&quot;' . esc_url( get_admin_url( $blog['blog_id'], 'users.php' ) ) . '&quot;&gt;' . __( 'More' ) . '&lt;/a&gt;';
</del><ins>+                                                                                        $blogusers_warning = __( 'Only showing first 5 users.' ) . ' &lt;a href=&quot;' . get_admin_url( $blog['blog_id'], 'users.php' ) . '&quot;&gt;' . __( 'More' ) . '&lt;/a&gt;';
</ins><span class="cx">                                                                                 }
</span><span class="cx">                                                                                 foreach ( $blogusers as $key =&gt; $val ) {
</span><del>-                                                                                        echo '&lt;a href=&quot;' . esc_url( admin_url( 'user-edit.php?user_id=' . $val-&gt;user_id ) ) . '&quot;&gt;' . esc_html( $val-&gt;user_login ) . '&lt;/a&gt; ';
</del><ins>+                                                                                        echo '&lt;a href=&quot;' . admin_url( 'user-edit.php?user_id=' . $val-&gt;user_id ) . '&quot;&gt;' . esc_html( $val-&gt;user_login ) . '&lt;/a&gt; ';
</ins><span class="cx">                                                                                         if ( 'list' != $mode )
</span><span class="cx">                                                                                                 echo '(' . $val-&gt;user_email . ')';
</span><span class="cx">                                                                                         echo '&lt;br /&gt;';
</span></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/ms-themes.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> $allowed_themes = get_site_allowed_themes();
</span><span class="cx"> ?&gt;
</span><span class="cx"> &lt;div class=&quot;wrap&quot;&gt;
</span><del>-        &lt;form action=&quot;&lt;?php echo esc_url( admin_url( 'ms-edit.php?action=updatethemes' ) ); ?&gt;&quot; method=&quot;post&quot;&gt;
</del><ins>+        &lt;form action=&quot;&lt;?php echo admin_url( 'ms-edit.php?action=updatethemes' ); ?&gt;&quot; method=&quot;post&quot;&gt;
</ins><span class="cx">                 &lt;?php screen_icon(); ?&gt;
</span><span class="cx">                 &lt;h2&gt;&lt;?php _e( 'Network Themes' ) ?&gt;&lt;/h2&gt;
</span><span class="cx">                 &lt;p&gt;&lt;?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?&gt;&lt;/p&gt;
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/ms-users.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -149,8 +149,8 @@
</span><span class="cx">                         &lt;?php } ?&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;div class=&quot;view-switch&quot;&gt;
</span><del>-                                &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'list' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-list&quot; src=&quot;&lt;?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e( 'List View' ) ?&gt;&quot; alt=&quot;&lt;?php _e( 'List View' ) ?&gt;&quot; /&gt;&lt;/a&gt;
-                                &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'excerpt' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-excerpt&quot; src=&quot;&lt;?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e( 'Excerpt View' ) ?&gt;&quot; alt=&quot;&lt;?php _e( 'Excerpt View' ) ?&gt;&quot; /&gt;&lt;/a&gt;
</del><ins>+                                &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'list' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-list&quot; src=&quot;&lt;?php echo includes_url( 'images/blank.gif' ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e( 'List View' ) ?&gt;&quot; alt=&quot;&lt;?php _e( 'List View' ) ?&gt;&quot; /&gt;&lt;/a&gt;
+                                &lt;a href=&quot;&lt;?php echo esc_url( add_query_arg( 'mode', 'excerpt', $_SERVER['REQUEST_URI'] ) ) ?&gt;&quot;&gt;&lt;img &lt;?php if ( 'excerpt' == $mode ) echo 'class=&quot;current&quot;'; ?&gt; id=&quot;view-switch-excerpt&quot; src=&quot;&lt;?php echo includes_url( 'images/blank.gif' ); ?&gt;&quot; width=&quot;20&quot; height=&quot;20&quot; title=&quot;&lt;?php _e( 'Excerpt View' ) ?&gt;&quot; alt=&quot;&lt;?php _e( 'Excerpt View' ) ?&gt;&quot; /&gt;&lt;/a&gt;
</ins><span class="cx">                         &lt;/div&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
</span><span class="lines">@@ -230,15 +230,15 @@
</span><span class="cx">                                                                 $edit_link = ( $current_user-&gt;ID == $user['ID'] ) ? 'profile.php' : 'user-edit.php?user_id=' . $user['ID'];
</span><span class="cx">                                                                 ?&gt;
</span><span class="cx">                                                                 &lt;td class=&quot;username column-username&quot;&gt;
</span><del>-                                                                        &lt;?php echo $avatar; ?&gt;&lt;strong&gt;&lt;a href=&quot;&lt;?php echo esc_url( admin_url( $edit_link ) ); ?&gt;&quot; class=&quot;edit&quot;&gt;&lt;?php echo stripslashes( $user['user_login'] ); ?&gt;&lt;/a&gt;&lt;?php
</del><ins>+                                                                        &lt;?php echo $avatar; ?&gt;&lt;strong&gt;&lt;a href=&quot;&lt;?php echo admin_url( $edit_link ); ?&gt;&quot; class=&quot;edit&quot;&gt;&lt;?php echo stripslashes( $user['user_login'] ); ?&gt;&lt;/a&gt;&lt;?php
</ins><span class="cx">                                                                         if ( in_array( $user['user_login'], $super_admins ) )
</span><span class="cx">                                                                                 echo ' - ' . __( 'Super admin' );
</span><span class="cx">                                                                         ?&gt;&lt;/strong&gt;
</span><span class="cx">                                                                         &lt;br/&gt;
</span><span class="cx">                                                                         &lt;div class=&quot;row-actions&quot;&gt;
</span><del>-                                                                                &lt;span class=&quot;edit&quot;&gt;&lt;a href=&quot;&lt;?php echo esc_url( admin_url( $edit_link ) ); ?&gt;&quot;&gt;&lt;?php _e( 'Edit' ); ?&gt;&lt;/a&gt;&lt;/span&gt;
</del><ins>+                                                                                &lt;span class=&quot;edit&quot;&gt;&lt;a href=&quot;&lt;?php echo admin_url( $edit_link ); ?&gt;&quot;&gt;&lt;?php _e( 'Edit' ); ?&gt;&lt;/a&gt;&lt;/span&gt;
</ins><span class="cx">                                                                                 &lt;?php if ( ! in_array( $user['user_login'], $super_admins ) ) { ?&gt;
</span><del>-                                                                                | &lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;&lt;?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;amp;action=deleteuser&amp;amp;id=' . $user['ID'] ) ) ); ?&gt;&quot; class=&quot;delete&quot;&gt;&lt;?php _e( 'Delete' ); ?&gt;&lt;/a&gt;&lt;/span&gt;
</del><ins>+                                                                                | &lt;span class=&quot;delete&quot;&gt;&lt;a href=&quot;&lt;?php echo $delete        = admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'ms-edit.php', 'deleteuser' ) . '&amp;amp;action=deleteuser&amp;amp;id=' . $user['ID'] ) ); ?&gt;&quot; class=&quot;delete&quot;&gt;&lt;?php _e( 'Delete' ); ?&gt;&lt;/a&gt;&lt;/span&gt;
</ins><span class="cx">                                                                                 &lt;?php } ?&gt;
</span><span class="cx">                                                                         &lt;/div&gt;
</span><span class="cx">                                                                 &lt;/td&gt;
</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 =&gt; $val ) {
</span><span class="cx">                                                                                         $path        = ( $val-&gt;path == '/' ) ? '' : $val-&gt;path;
</span><del>-                                                                                        echo '&lt;a href=&quot;'. esc_url( admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $val-&gt;userblog_id  ) ) .'&quot;&gt;' . str_replace( '.' . $current_site-&gt;domain, '', $val-&gt;domain . $path ) . '&lt;/a&gt;';
</del><ins>+                                                                                        echo '&lt;a href=&quot;'. admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $val-&gt;userblog_id ) .'&quot;&gt;' . str_replace( '.' . $current_site-&gt;domain, '', $val-&gt;domain . $path ) . '&lt;/a&gt;';
</ins><span class="cx">                                                                                         echo ' &lt;small class=&quot;row-actions&quot;&gt;';
</span><span class="cx"> 
</span><span class="cx">                                                                                         // Edit
</span><del>-                                                                                        echo '&lt;a href=&quot;'. esc_url( admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $val-&gt;userblog_id  ) ) .'&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt; | ';
</del><ins>+                                                                                        echo '&lt;a href=&quot;'. admin_url( 'ms-sites.php?action=editblog&amp;amp;id=' . $val-&gt;userblog_id ) .'&quot;&gt;' . __( 'Edit' ) . '&lt;/a&gt; | ';
</ins><span class="cx"> 
</span><span class="cx">                                                                                         // View
</span><span class="cx">                                                                                         echo '&lt;a ';
</span><span class="cx">                                                                                         if ( get_blog_status( $val-&gt;userblog_id, 'spam' ) == 1 )
</span><span class="cx">                                                                                                 echo 'style=&quot;background-color: #faa&quot; ';
</span><del>-                                                                                        echo 'href=&quot;' .  esc_url( get_home_url( $val-&gt;userblog_id ) )  . '&quot;&gt;' . __( 'View' ) . '&lt;/a&gt;';
</del><ins>+                                                                                        echo 'href=&quot;' .  get_home_url( $val-&gt;userblog_id ) . '&quot;&gt;' . __( 'View' ) . '&lt;/a&gt;';
</ins><span class="cx">                                                                                         
</span><span class="cx">                                                                                         echo '&lt;/small&gt;&lt;br /&gt;';
</span><span class="cx">                                                                                 }
</span></span></pre></div>
<a id="trunkwpadminmysitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/my-sites.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/my-sites.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/my-sites.php        2010-05-02 22:53:59 UTC (rev 14347)
</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 &quot;&lt;td valign='top' style='$s'&gt;&quot;;
</span><span class="cx">                         echo &quot;&lt;h3&gt;{$user_blog-&gt;blogname}&lt;/h3&gt;&quot;;
</span><del>-                        echo &quot;&lt;p&gt;&quot; . apply_filters( 'myblogs_blog_actions', &quot;&lt;a href='&quot; . esc_url( get_home_url( $user_blog-&gt;userblog_id ) ). &quot;'&gt;&quot; . __( 'Visit' ) . &quot;&lt;/a&gt; | &lt;a href='&quot; . esc_url( get_admin_url( $user_blog-&gt;userblog_id ) ) . &quot;'&gt;&quot; . __( 'Dashboard' ) . &quot;&lt;/a&gt;&quot;, $user_blog ) . &quot;&lt;/p&gt;&quot;;
</del><ins>+                        echo &quot;&lt;p&gt;&quot; . apply_filters( 'myblogs_blog_actions', &quot;&lt;a href='&quot; . get_home_url( $user_blog-&gt;userblog_id ). &quot;'&gt;&quot; . __( 'Visit' ) . &quot;&lt;/a&gt; | &lt;a href='&quot; . get_admin_url( $user_blog-&gt;userblog_id ) . &quot;'&gt;&quot; . __( 'Dashboard' ) . &quot;&lt;/a&gt;&quot;, $user_blog ) . &quot;&lt;/p&gt;&quot;;
</ins><span class="cx">                         echo apply_filters( 'myblogs_options', '', $user_blog );
</span><span class="cx">                         echo &quot;&lt;/td&gt;&quot;;
</span><span class="cx">                         $i++;
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/network.php        2010-05-02 22:53:59 UTC (rev 14347)
</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 '&lt;div class=&quot;error&quot;&gt;&lt;p&gt;&lt;strong&gt;' . __('Error:') . '&lt;/strong&gt; ' . sprintf( __( 'Your &lt;strong&gt;WordPress address&lt;/strong&gt; must match your &lt;strong&gt;Site address&lt;/strong&gt; before creating a Network. See &lt;a href=&quot;%s&quot;&gt;General Settings&lt;/a&gt;.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '&lt;/strong&gt;&lt;/p&gt;&lt;/div&gt;';
</del><ins>+                echo '&lt;div class=&quot;error&quot;&gt;&lt;p&gt;&lt;strong&gt;' . __('Error:') . '&lt;/strong&gt; ' . sprintf( __( 'Your &lt;strong&gt;WordPress address&lt;/strong&gt; must match your &lt;strong&gt;Site address&lt;/strong&gt; before creating a Network. See &lt;a href=&quot;%s&quot;&gt;General Settings&lt;/a&gt;.' ), admin_url( 'options-general.php' ) ) . '&lt;/strong&gt;&lt;/p&gt;&lt;/div&gt;';
</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 '&lt;p&gt;' . __( 'You cannot use an IP address such as &lt;code&gt;127.0.0.1&lt;/code&gt;.' ) . '&lt;/p&gt;';
</span><span class="cx">                 else
</span><span class="cx">                         echo '&lt;p&gt;' . sprintf( __( 'You cannot use port numbers such as &lt;code&gt;%s&lt;/code&gt;.' ), $has_ports ) . '&lt;/p&gt;';
</span><del>-                echo '&lt;a href=&quot;' . esc_url( admin_url() ) . '&quot;&gt;' . __( 'Return to Dashboard' ) . '&lt;/a&gt;';
</del><ins>+                echo '&lt;a href=&quot;' . admin_url() . '&quot;&gt;' . __( 'Return to Dashboard' ) . '&lt;/a&gt;';
</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"> &lt;/textarea&gt;&lt;/li&gt;
</span><span class="cx">                 &lt;/ol&gt;
</span><span class="cx"> &lt;?php if ( !is_multisite() ) { ?&gt;
</span><del>-                &lt;p&gt;&lt;?php printf( __( 'Once you complete these steps, your network is enabled and configured.') ); ?&gt; &lt;a href=&quot;&lt;?php echo esc_url( admin_url() ); ?&gt;&quot;&gt;&lt;?php _e( 'Return to Dashboard' ); ?&gt;&lt;/a&gt;&lt;/p&gt;
</del><ins>+                &lt;p&gt;&lt;?php printf( __( 'Once you complete these steps, your network is enabled and configured.') ); ?&gt; &lt;a href=&quot;&lt;?php echo admin_url(); ?&gt;&quot;&gt;&lt;?php _e( 'Return to Dashboard' ); ?&gt;&lt;/a&gt;&lt;/p&gt;
</ins><span class="cx"> &lt;?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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/options-general.php        2010-05-02 22:53:59 UTC (rev 14347)
</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 &amp;&amp; $new_admin_email != get_option('admin_email') ) : ?&gt;
</span><span class="cx"> &lt;div class=&quot;updated inline&quot;&gt;
</span><del>-&lt;p&gt;&lt;?php printf( __('There is a pending change of the admin e-mail to &lt;code&gt;%1$s&lt;/code&gt;. &lt;a href=&quot;%2$s&quot;&gt;Cancel&lt;/a&gt;'), $new_admin_email, esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?&gt;&lt;/p&gt;
</del><ins>+&lt;p&gt;&lt;?php printf( __('There is a pending change of the admin e-mail to &lt;code&gt;%1$s&lt;/code&gt;. &lt;a href=&quot;%2$s&quot;&gt;Cancel&lt;/a&gt;'), $new_admin_email, admin_url( 'options.php?dismiss=new_admin_email' ) ); ?&gt;&lt;/p&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><span class="cx"> &lt;?php endif; ?&gt;
</span><span class="cx"> &lt;/td&gt;
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/press-this.php        2010-05-02 22:53:59 UTC (rev 14347)
</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('&lt;div id=&quot;waiting&quot;&gt;&lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt; &lt;?php echo esc_js( __( 'Loading...' ) ); ?&gt;&lt;/div&gt;');
</del><ins>+                                jQuery('#extra-fields').before('&lt;div id=&quot;waiting&quot;&gt;&lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; /&gt; &lt;?php echo esc_js( __( 'Loading...' ) ); ?&gt;&lt;/div&gt;');
</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">                                                 &lt;?php } else { ?&gt;
</span><span class="cx">                                                         &lt;br /&gt;&lt;br /&gt;&lt;input class=&quot;button-primary&quot; type=&quot;submit&quot; name=&quot;review&quot; value=&quot;&lt;?php esc_attr_e('Submit for Review') ?&gt;&quot; id=&quot;review&quot; /&gt;
</span><span class="cx">                                                 &lt;?php } ?&gt;
</span><del>-                                                &lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; id=&quot;saving&quot; style=&quot;display:none;&quot; /&gt;
</del><ins>+                                                &lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; alt=&quot;&quot; id=&quot;saving&quot; style=&quot;display:none;&quot; /&gt;
</ins><span class="cx">                                         &lt;/p&gt;
</span><span class="cx">                                 &lt;/div&gt;
</span><span class="cx">                         &lt;/div&gt;
</span><span class="lines">@@ -563,11 +563,11 @@
</span><span class="cx"> 
</span><span class="cx">                                 &lt;li id=&quot;photo_button&quot;&gt;
</span><span class="cx">                                         Add: &lt;?php if ( current_user_can('upload_files') ) { ?&gt;&lt;a title=&quot;&lt;?php _e('Insert an Image'); ?&gt;&quot; href=&quot;#&quot;&gt;
</span><del>-&lt;img alt=&quot;&lt;?php _e('Insert an Image'); ?&gt;&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/media-button-image.gif' ) ); ?&gt;&quot;/&gt;&lt;/a&gt;
</del><ins>+&lt;img alt=&quot;&lt;?php _e('Insert an Image'); ?&gt;&quot; src=&quot;&lt;?php echo admin_url( 'images/media-button-image.gif' ); ?&gt;&quot;/&gt;&lt;/a&gt;
</ins><span class="cx">                                         &lt;?php } ?&gt;
</span><span class="cx">                                 &lt;/li&gt;
</span><span class="cx">                                 &lt;li id=&quot;video_button&quot;&gt;
</span><del>-                                        &lt;a title=&quot;&lt;?php _e('Embed a Video'); ?&gt;&quot; href=&quot;#&quot;&gt;&lt;img alt=&quot;&lt;?php _e('Embed a Video'); ?&gt;&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/media-button-video.gif' ) ); ?&gt;&quot;/&gt;&lt;/a&gt;
</del><ins>+                                        &lt;a title=&quot;&lt;?php _e('Embed a Video'); ?&gt;&quot; href=&quot;#&quot;&gt;&lt;img alt=&quot;&lt;?php _e('Embed a Video'); ?&gt;&quot; src=&quot;&lt;?php echo admin_url( 'images/media-button-video.gif' ); ?&gt;&quot;/&gt;&lt;/a&gt;
</ins><span class="cx">                                 &lt;/li&gt;
</span><span class="cx">                                 &lt;?php if ( user_can_richedit() ) { ?&gt;
</span><span class="cx">                                 &lt;li id=&quot;switcher&quot;&gt;
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/themes.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -212,7 +212,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 = esc_url(get_option('home') . '/');
</del><ins>+        $preview_link = trailingslashit( home_url() );
</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' =&gt; 1, 'template' =&gt; $template, 'stylesheet' =&gt; $stylesheet, 'TB_iframe' =&gt; 'true' ), $preview_link ) );
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/update-core.php        2010-05-02 22:53:59 UTC (rev 14347)
</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( '&lt;strong&gt;' . __('Actions:') . '&lt;/strong&gt; &lt;a href=&quot;' . esc_url( admin_url() ) . '&quot;&gt;' . __('Go to Dashboard') . '&lt;/a&gt;' );
</del><ins>+                show_message( '&lt;strong&gt;' . __('Actions:') . '&lt;/strong&gt; &lt;a href=&quot;' . admin_url() . '&quot;&gt;' . __('Go to Dashboard') . '&lt;/a&gt;' );
</ins><span class="cx">         }
</span><span class="cx">         echo '&lt;/div&gt;';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/upload.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> 
</span><span class="cx"> if ( isset($_GET['trashed']) &amp;&amp; (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 .= ' &lt;a href=&quot;' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&amp;action=untrash&amp;ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), &quot;bulk-media&quot; ) ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;';
</del><ins>+        $message .= ' &lt;a href=&quot;' . wp_nonce_url( 'upload.php?doaction=undo&amp;action=untrash&amp;ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), &quot;bulk-media&quot; ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;';
</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.') . ' &lt;a href=&quot;' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&amp;action=untrash&amp;ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), &quot;bulk-media&quot; ) ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;';
</del><ins>+$messages[4] = __('Media moved to the trash.') . ' &lt;a href=&quot;' . wp_nonce_url( 'upload.php?doaction=undo&amp;action=untrash&amp;ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), &quot;bulk-media&quot; ) . '&quot;&gt;' . __('Undo') . '&lt;/a&gt;';
</ins><span class="cx"> $messages[5] = __('Media restored from the trash.');
</span><span class="cx"> 
</span><span class="cx"> if ( isset($_GET['message']) &amp;&amp; (int) $_GET['message'] ) {
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/user-edit.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> &lt;?php screen_icon(); ?&gt;
</span><span class="cx"> &lt;h2&gt;&lt;?php echo esc_html( $title ); ?&gt;&lt;/h2&gt;
</span><span class="cx"> 
</span><del>-&lt;form id=&quot;your-profile&quot; action=&quot;&lt;?php echo esc_url( admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?&gt;&quot; method=&quot;post&quot;&lt;?php do_action('user_edit_form_tag'); ?&gt;&gt;
</del><ins>+&lt;form id=&quot;your-profile&quot; action=&quot;&lt;?php echo admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ); ?&gt;&quot; method=&quot;post&quot;&lt;?php do_action('user_edit_form_tag'); ?&gt;&gt;
</ins><span class="cx"> &lt;?php wp_nonce_field('update-user_' . $user_id) ?&gt;
</span><span class="cx"> &lt;?php if ( $wp_http_referer ) : ?&gt;
</span><span class="cx">         &lt;input type=&quot;hidden&quot; name=&quot;wp_http_referer&quot; value=&quot;&lt;?php echo esc_url($wp_http_referer); ?&gt;&quot; /&gt;
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-admin/widgets.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx">                 &lt;div class=&quot;sidebar-name&quot;&gt;
</span><span class="cx">                 &lt;div class=&quot;sidebar-name-arrow&quot;&gt;&lt;br /&gt;&lt;/div&gt;
</span><span class="cx">                 &lt;h3&gt;&lt;?php _e('Inactive Widgets'); ?&gt;
</span><del>-                &lt;span&gt;&lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; class=&quot;ajax-feedback&quot; title=&quot;&quot; alt=&quot;&quot; /&gt;&lt;/span&gt;&lt;/h3&gt;&lt;/div&gt;
</del><ins>+                &lt;span&gt;&lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_light.gif' ); ?&gt;&quot; class=&quot;ajax-feedback&quot; title=&quot;&quot; alt=&quot;&quot; /&gt;&lt;/span&gt;&lt;/h3&gt;&lt;/div&gt;
</ins><span class="cx">                 &lt;div class=&quot;widget-holder inactive&quot;&gt;
</span><span class="cx">                 &lt;p class=&quot;description&quot;&gt;&lt;?php _e('Drag widgets here to remove them from the sidebar but keep their settings.'); ?&gt;&lt;/p&gt;
</span><span class="cx">                 &lt;?php wp_list_widget_controls('wp_inactive_widgets'); ?&gt;
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx">         &lt;div class=&quot;sidebar-name&quot;&gt;
</span><span class="cx">         &lt;div class=&quot;sidebar-name-arrow&quot;&gt;&lt;br /&gt;&lt;/div&gt;
</span><span class="cx">         &lt;h3&gt;&lt;?php echo esc_html( $registered_sidebar['name'] ); ?&gt;
</span><del>-        &lt;span&gt;&lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_dark.gif' ) ); ?&gt;&quot; class=&quot;ajax-feedback&quot; title=&quot;&quot; alt=&quot;&quot; /&gt;&lt;/span&gt;&lt;/h3&gt;&lt;/div&gt;
</del><ins>+        &lt;span&gt;&lt;img src=&quot;&lt;?php echo admin_url( 'images/wpspin_dark.gif' ); ?&gt;&quot; class=&quot;ajax-feedback&quot; title=&quot;&quot; alt=&quot;&quot; /&gt;&lt;/span&gt;&lt;/h3&gt;&lt;/div&gt;
</ins><span class="cx">         &lt;?php wp_list_widget_controls( $sidebar ); // Show the control forms for each of the widgets in this sidebar ?&gt;
</span><span class="cx">         &lt;/div&gt;
</span><span class="cx"> &lt;?php
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-content/themes/twentyten/functions.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx">                         &lt;br /&gt;
</span><span class="cx">                 &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><del>-                &lt;div class=&quot;comment-meta commentmetadata&quot;&gt;&lt;a href=&quot;&lt;?php echo esc_url( get_comment_link( $comment-&gt;comment_ID ) ); ?&gt;&quot;&gt;&lt;?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(),  get_comment_time() ); ?&gt;&lt;/a&gt;&lt;?php edit_comment_link( __( '(Edit)', 'twentyten' ),'  ','' ); ?&gt;&lt;/div&gt;
</del><ins>+                &lt;div class=&quot;comment-meta commentmetadata&quot;&gt;&lt;a href=&quot;&lt;?php echo get_comment_link( $comment-&gt;comment_ID ); ?&gt;&quot;&gt;&lt;?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(),  get_comment_time() ); ?&gt;&lt;/a&gt;&lt;?php edit_comment_link( __( '(Edit)', 'twentyten' ),'  ','' ); ?&gt;&lt;/div&gt;
</ins><span class="cx"> 
</span><span class="cx">                 &lt;div class=&quot;comment-body&quot;&gt;&lt;?php comment_text(); ?&gt;&lt;/div&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-includes/comment-template.php        2010-05-02 22:53:59 UTC (rev 14347)
</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') &amp;&amp; !$user_ID )
</span><del>-                $link = '&lt;a rel=&quot;nofollow&quot; class=&quot;comment-reply-login&quot; href=&quot;' . esc_url( wp_login_url( get_permalink() ) ) . '&quot;&gt;' . $login_text . '&lt;/a&gt;';
</del><ins>+                $link = '&lt;a rel=&quot;nofollow&quot; class=&quot;comment-reply-login&quot; href=&quot;' . wp_login_url( get_permalink() ) . '&quot;&gt;' . $login_text . '&lt;/a&gt;';
</ins><span class="cx">         else
</span><span class="cx">                 $link = &quot;&lt;a rel='nofollow' class='comment-reply-link' href='&quot; . esc_url( add_query_arg( 'replytocom', $comment-&gt;comment_ID ) ) . &quot;#&quot; . $respond_id . &quot;' onclick='return addComment.moveForm(\&quot;$add_below-$comment-&gt;comment_ID\&quot;, \&quot;$comment-&gt;comment_ID\&quot;, \&quot;$respond_id\&quot;, \&quot;$post-&gt;ID\&quot;)'&gt;$reply_text&lt;/a&gt;&quot;;
</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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-includes/default-widgets.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx">                         &lt;?php if ( $title ) echo $before_title . $title . $after_title; ?&gt;
</span><span class="cx">                         &lt;ul id=&quot;recentcomments&quot;&gt;&lt;?php
</span><span class="cx">                         if ( $comments ) : foreach ( (array) $comments as $comment) :
</span><del>-                        echo  '&lt;li class=&quot;recentcomments&quot;&gt;' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '&lt;a href=&quot;' . esc_url( get_comment_link($comment-&gt;comment_ID) ) . '&quot;&gt;' . get_the_title($comment-&gt;comment_post_ID) . '&lt;/a&gt;') . '&lt;/li&gt;';
</del><ins>+                        echo  '&lt;li class=&quot;recentcomments&quot;&gt;' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '&lt;a href=&quot;' . get_comment_link($comment-&gt;comment_ID) . '&quot;&gt;' . get_the_title($comment-&gt;comment_post_ID) . '&lt;/a&gt;') . '&lt;/li&gt;';
</ins><span class="cx">                         endforeach; endif;?&gt;&lt;/ul&gt;
</span><span class="cx">                 &lt;?php echo $after_widget; ?&gt;
</span><span class="cx"> &lt;?php
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-includes/general-template.php        2010-05-02 22:53:59 UTC (rev 14347)
</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 = '&lt;a href=&quot;' . esc_url( wp_login_url($redirect) ) . '&quot;&gt;' . __('Log in') . '&lt;/a&gt;';
</del><ins>+                $link = '&lt;a href=&quot;' . wp_login_url($redirect) . '&quot;&gt;' . __('Log in') . '&lt;/a&gt;';
</ins><span class="cx">         else
</span><del>-                $link = '&lt;a href=&quot;' . esc_url( wp_logout_url($redirect) ) . '&quot;&gt;' . __('Log out') . '&lt;/a&gt;';
</del><ins>+                $link = '&lt;a href=&quot;' . wp_logout_url($redirect) . '&quot;&gt;' . __('Log out') . '&lt;/a&gt;';
</ins><span class="cx"> 
</span><span class="cx">         if ( $echo )
</span><span class="cx">                 echo apply_filters('loginout', $link);
</span><span class="lines">@@ -2111,9 +2111,9 @@
</span><span class="cx">                 return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        echo apply_filters( 'wp_admin_css', &quot;&lt;link rel='stylesheet' href='&quot; . esc_url( wp_admin_css_uri( $file ) ) . &quot;' type='text/css' /&gt;\n&quot;, $file );
</del><ins>+        echo apply_filters( 'wp_admin_css', &quot;&lt;link rel='stylesheet' href='&quot; . wp_admin_css_uri( $file ) . &quot;' type='text/css' /&gt;\n&quot;, $file );
</ins><span class="cx">         if ( 'rtl' == get_bloginfo( 'text_direction' ) )
</span><del>-                echo apply_filters( 'wp_admin_css', &quot;&lt;link rel='stylesheet' href='&quot; . esc_url( wp_admin_css_uri( &quot;$file-rtl&quot; ) ) . &quot;' type='text/css' /&gt;\n&quot;, &quot;$file-rtl&quot; );
</del><ins>+                echo apply_filters( 'wp_admin_css', &quot;&lt;link rel='stylesheet' href='&quot; . wp_admin_css_uri( &quot;$file-rtl&quot; ) . &quot;' type='text/css' /&gt;\n&quot;, &quot;$file-rtl&quot; );
</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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-includes/link-template.php        2010-05-02 22:53:59 UTC (rev 14347)
</span><span class="lines">@@ -1824,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 ) {
-        return get_home_url(null, $path, $scheme);
</del><ins>+function home_url( $path = '', $scheme = null, $esc_url = true ) {
+        return get_home_url(null, $path, $scheme, $esc_url);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -1843,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 ) {
</del><ins>+function get_home_url( $blog_id = null, $path = '', $scheme = null, $esc_url = true ) {
</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">@@ -1859,7 +1859,12 @@
</span><span class="cx">         if ( !empty( $path ) &amp;&amp; is_string( $path ) &amp;&amp; strpos( $path, '..' ) === false )
</span><span class="cx">                 $url .= '/' . ltrim( $path, '/' );
</span><span class="cx"> 
</span><del>-        return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
</del><ins>+        $url = apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -1878,8 +1883,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 ) {
-        return get_site_url(null, $path, $scheme);
</del><ins>+function site_url( $path = '', $scheme = null, $esc_url = true ) {
+        return get_site_url(null, $path, $scheme, $esc_url);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -1897,7 +1902,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 ) {
</del><ins>+function get_site_url( $blog_id = null, $path = '', $scheme = null, $esc_url = true ) {
</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">@@ -1921,7 +1926,12 @@
</span><span class="cx">         if ( !empty($path) &amp;&amp; is_string($path) &amp;&amp; strpos($path, '..') === false )
</span><span class="cx">                 $url .= '/' . ltrim($path, '/');
</span><span class="cx"> 
</span><del>-        return apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
</del><ins>+        $url = apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -1934,8 +1944,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' ) {
-        return get_admin_url(null, $path, $scheme);
</del><ins>+function admin_url( $path = '', $scheme = 'admin', $esc_url = true ) {
+        return get_admin_url(null, $path, $scheme, $esc_url);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -1949,13 +1959,18 @@
</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' ) {
</del><ins>+function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin', $esc_url = true ) {
</ins><span class="cx">         $url = get_site_url($blog_id, 'wp-admin/', $scheme);
</span><span class="cx"> 
</span><span class="cx">         if ( !empty($path) &amp;&amp; is_string($path) &amp;&amp; strpos($path, '..') === false )
</span><span class="cx">                 $url .= ltrim($path, '/');
</span><span class="cx"> 
</span><del>-        return apply_filters('admin_url', $url, $path, $blog_id);
</del><ins>+        $url = apply_filters('admin_url', $url, $path, $blog_id);
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -1967,13 +1982,18 @@
</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 = '') {
</del><ins>+function includes_url($path = '', $esc_url = true) {
</ins><span class="cx">         $url = site_url() . '/' . WPINC . '/';
</span><span class="cx"> 
</span><span class="cx">         if ( !empty($path) &amp;&amp; is_string($path) &amp;&amp; strpos($path, '..') === false )
</span><span class="cx">                 $url .= ltrim($path, '/');
</span><span class="cx"> 
</span><del>-        return apply_filters('includes_url', $url, $path);
</del><ins>+        $url = apply_filters('includes_url', $url, $path);
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -1985,7 +2005,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 = '') {
</del><ins>+function content_url($path = '', $esc_url = true) {
</ins><span class="cx">         $url = WP_CONTENT_URL;
</span><span class="cx">         if ( 0 === strpos($url, 'http') &amp;&amp; is_ssl() )
</span><span class="cx">                 $url = str_replace( 'http://', 'https://', $url );
</span><span class="lines">@@ -1993,7 +2013,12 @@
</span><span class="cx">         if ( !empty($path) &amp;&amp; is_string($path) &amp;&amp; strpos($path, '..') === false )
</span><span class="cx">                 $url .= '/' . ltrim($path, '/');
</span><span class="cx"> 
</span><del>-        return apply_filters('content_url', $url, $path);
</del><ins>+        $url = apply_filters('content_url', $url, $path);
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -2007,7 +2032,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 = '') {
</del><ins>+function plugins_url($path = '', $plugin = '', $esc_url = true) {
</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">@@ -2032,7 +2057,13 @@
</span><span class="cx">         if ( !empty($path) &amp;&amp; is_string($path) &amp;&amp; strpos($path, '..') === false )
</span><span class="cx">                 $url .= '/' . ltrim($path, '/');
</span><span class="cx"> 
</span><del>-        return apply_filters('plugins_url', $url, $path, $plugin);
</del><ins>+        $url = apply_filters('plugins_url', $url, $path, $plugin);
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
+
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -2049,7 +2080,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 ) {
</del><ins>+function network_site_url( $path = '', $scheme = null, $esc_url = true ) {
</ins><span class="cx">         global $current_site;
</span><span class="cx"> 
</span><span class="cx">         if ( !is_multisite() )
</span><span class="lines">@@ -2074,7 +2105,12 @@
</span><span class="cx">         if ( !empty($path) &amp;&amp; is_string($path) &amp;&amp; strpos($path, '..') === false )
</span><span class="cx">                 $url .= ltrim($path, '/');
</span><span class="cx"> 
</span><del>-        return apply_filters('network_site_url', $url, $path, $orig_scheme);
</del><ins>+        $url = apply_filters('network_site_url', $url, $path, $orig_scheme);
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -2091,7 +2127,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 ) {
</del><ins>+function network_home_url( $path = '', $scheme = null, $esc_url = true ) {
</ins><span class="cx">         global $current_site;
</span><span class="cx"> 
</span><span class="cx">         if ( !is_multisite() )
</span><span class="lines">@@ -2109,7 +2145,12 @@
</span><span class="cx">         if ( !empty( $path ) &amp;&amp; is_string( $path ) &amp;&amp; strpos( $path, '..' ) === false )
</span><span class="cx">                 $url .= ltrim( $path, '/' );
</span><span class="cx"> 
</span><del>-        return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
</del><ins>+        $url = apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -2122,13 +2163,18 @@
</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' ) {
</del><ins>+function network_admin_url( $path = '', $scheme = 'admin', $esc_url = true ) {
</ins><span class="cx">         $url = network_site_url('wp-admin/', $scheme);
</span><span class="cx"> 
</span><span class="cx">         if ( !empty($path) &amp;&amp; is_string($path) &amp;&amp; strpos($path, '..') === false )
</span><span class="cx">                 $url .= ltrim($path, '/');
</span><span class="cx"> 
</span><del>-        return apply_filters('network_admin_url', $url, $path);
</del><ins>+        $url = apply_filters('network_admin_url', $url, $path);
+
+        if ( $esc_url )
+                $url = esc_url($url);
+
+        return $url;
</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 (14346 => 14347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php        2010-05-02 22:25:30 UTC (rev 14346)
+++ trunk/wp-includes/ms-functions.php        2010-05-02 22:53:59 UTC (rev 14347)
</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 = esc_url(network_admin_url('ms-options.php'));
</del><ins>+        $options_site_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 = esc_url(network_admin_url('ms-options.php'));
</del><ins>+        $options_site_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>