Wordpress 2.8.5

[autoinstalls/wordpress.git] / wp-includes / media.php

diff --git a/wp-includes/media.php b/wp-includes/media.php
index 7f34963842d7d62b93ba7de00bcf74945ac28188..22e67819950be97266921c8a898103251f6a95a5 100644 (file)
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -591,9 +591,9 @@ function img_caption_shortcode($attr, $content = null) {
        if ( 1 > (int) $width || empty($caption) )
                return $content;
 
-       if ( $id ) $id = 'id="' . $id . '" ';
+       if ( $id ) $id = 'id="' . esc_attr($id) . '" ';
 
-       return '<div ' . $id . 'class="wp-caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">'
+       return '<div ' . $id . 'class="wp-caption ' . esc_attr($align) . '" style="width: ' . (10 + (int) $width) . 'px">'
        . do_shortcode( $content ) . '<p class="wp-caption-text">' . $caption . '</p></div>';
 }