<!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>[14207] trunk/wp-includes/link-template.php:
Added escaping to wp_shortlink_wp_head() too.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14207">14207</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-04-23 21:20:16 +0000 (Fri, 23 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added escaping to wp_shortlink_wp_head() too. See <a href="http://trac.wordpress.org/ticket/10640">#10640</a> props sirzooro.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (14206 => 14207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-04-23 20:34:03 UTC (rev 14206)
+++ trunk/wp-includes/link-template.php 2010-04-23 21:20:16 UTC (rev 14207)
</span><span class="lines">@@ -2199,12 +2199,12 @@
</span><span class="cx"> * @uses wp_get_shortlink()
</span><span class="cx"> */
</span><span class="cx"> function wp_shortlink_wp_head() {
</span><del>- $shortlink = wp_get_shortlink(0, 'query');
</del><ins>+ $shortlink = wp_get_shortlink( 0, 'query' );
</ins><span class="cx">
</span><del>- if ( empty($shortlink) )
</del><ins>+ if ( empty( $shortlink ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- echo "<link rel='shortlink' href='" . $shortlink . "' />\n";
</del><ins>+ echo "<link rel='shortlink' href='" . esc_attr( $shortlink ) . "' />\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2242,19 +2242,22 @@
</span><span class="cx"> * @param string $before Optional HTML to display before the link.
</span><span class="cx"> * @param string $before Optional HTML to display after the link.
</span><span class="cx"> */
</span><del>-function the_shortlink($text = '', $title = '', $before = '', $after = '') {
</del><ins>+function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
</ins><span class="cx"> global $post;
</span><span class="cx">
</span><del>- if ( empty($text) )
</del><ins>+ if ( empty( $text ) )
</ins><span class="cx"> $text = __('This is the short link.');
</span><span class="cx">
</span><del>- if ( empty($title) )
- $title = the_title_attribute( array('echo' => FALSE) );
</del><ins>+ if ( empty( $title ) )
+ $title = the_title_attribute( array( 'echo' => FALSE ) );
</ins><span class="cx">
</span><del>- $shortlink = wp_get_shortlink($post->ID);
</del><ins>+ $shortlink = wp_get_shortlink( $post->ID );
</ins><span class="cx">
</span><del>- if ( !empty($shortlink) )
- echo "$before<a rel='shortlink' href='$shortlink' title='$title'>$text</a>$after";
</del><ins>+ if ( !empty( $shortlink ) ) {
+ $link = '<a rel="shortlink" href="' . esc_attr( $shortlink ) . '" title="' . $title . '">' . $text . '</a>';
+ $link = apply_filters( 'the_shortlink', $link, $shortlink, $text, $title );
+ echo $before, $link, $after;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>