Changeset 14207

Timestamp:

04/23/2010 09:20:16 PM (16 years ago)

Author:

westi

Message:

Added escaping to wp_shortlink_wp_head() too. See #10640 props sirzooro.

File:

• trunk/wp-includes/link-template.php (modified) (2 diffs)

trunk/wp-includes/link-template.php

@@ -2200 +2200 @@
  */
 function wp_shortlink_wp_head() {
-        $shortlink = wp_get_shortlink(0, 'query');
-
-        if ( empty($shortlink) )
-                return;
-
-        echo "<link rel='shortlink' href='" . $shortlink . "' />\n";
+        $shortlink = wp_get_shortlink( 0, 'query' );
+
+        if ( empty( $shortlink ) )
+                return;
+
+        echo "<link rel='shortlink' href='" . esc_attr( $shortlink ) . "' />\n";
 }
 
@@ -2243 +2243 @@
  * @param string $before Optional HTML to display after the link.
  */
-function the_shortlink($text = '', $title = '', $before = '', $after = '') {
+function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
         global $post;
 
-        if ( empty($text) )
+        if ( empty( $text ) )
                 $text = __('This is the short link.');
 
-        if ( empty($title) )
-                $title = the_title_attribute( array('echo' => FALSE) );
-
-        $shortlink = wp_get_shortlink($post->ID);
-
-        if ( !empty($shortlink) )
-                echo "$before<a rel='shortlink' href='$shortlink' title='$title'>$text</a>$after";
+        if ( empty( $title ) )
+                $title = the_title_attribute( array( 'echo' => FALSE ) );
+
+        $shortlink = wp_get_shortlink( $post->ID );
+
+        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;
+        }
 }