<!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>[15264] trunk: Two birds with one stone.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15264">15264</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-15 20:31:44 +0000 (Tue, 15 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Two birds with one stone. fixes <a href="http://trac.wordpress.org/ticket/13902">#13902</a>, props ocean90, wahgnube. fixes <a href="http://trac.wordpress.org/ticket/13555">#13555</a>, props hakre.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminimportphp">trunk/wp-admin/import.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import.php (15263 => 15264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import.php 2010-06-15 20:07:02 UTC (rev 15263)
+++ trunk/wp-admin/import.php 2010-06-15 20:31:44 UTC (rev 15264)
</span><span class="lines">@@ -103,13 +103,13 @@
</span><span class="cx"> if ( !empty($plugins) ) {
</span><span class="cx"> $keys = array_keys($plugins);
</span><span class="cx"> $plugin_file = $plugin_slug . '/' . $keys[0];
</span><del>- $action = '<a href="' . wp_nonce_url(admin_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;from=import'), 'activate-plugin_' . $plugin_file) .
</del><ins>+ $action = '<a href="' . esc_url(wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $plugin_file . '&from=import'), 'activate-plugin_' . $plugin_file)) .
</ins><span class="cx"> '"title="' . esc_attr__('Activate importer') . '"">' . $data[0] . '</a>';
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( empty($action) )
</span><del>- $action = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin_slug .
- '&amp;from=import&amp;TB_iframe=true&amp;width=600&amp;height=550') . '" class="thickbox" title="' .
</del><ins>+ $action = '<a href="' . esc_url(admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
+ '&from=import&TB_iframe=true&width=600&height=550')) . '" class="thickbox" title="' .
</ins><span class="cx"> esc_attr__('Install importer') . '">' . $data[0] . '</a>';
</span><span class="cx"> } else {
</span><span class="cx"> $action = "<a href='" . esc_url("admin.php?import=$id") . "' title='" . esc_attr( wptexturize(strip_tags($data[1])) ) ."'>{$data[0]}</a>";
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( current_user_can('install_plugins') )
</span><del>- echo '<p>' . sprintf('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.', admin_url('plugin-install.php?tab=search&type=tag&s=importer') ) . '</p>';
</del><ins>+ echo '<p>' . sprintf('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.', esc_url(admin_url('plugin-install.php?tab=search&type=tag&s=importer')) ) . '</p>';
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (15263 => 15264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-06-15 20:07:02 UTC (rev 15263)
+++ trunk/wp-includes/post-template.php 2010-06-15 20:31:44 UTC (rev 15264)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> * @param int $id Optional. Post ID.
</span><span class="cx"> */
</span><span class="cx"> function the_guid( $id = 0 ) {
</span><del>- echo esc_url( get_the_guid($id) );
</del><ins>+ echo esc_url( get_the_guid( $id ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>