Wordpress 3.0.4

[autoinstalls/wordpress.git] / wp-includes / bookmark-template.php

diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php
index 844f664f772a4b8633105e516ba99635df4371aa..7c5949cc21748b20179d4c6330092aae2e362c3e 100644 (file)
--- a/wp-includes/bookmark-template.php
+++ b/wp-includes/bookmark-template.php
@@ -70,14 +70,10 @@ function _walk_bookmarks($bookmarks, $args = '' ) {
 
                $the_link = '#';
                if ( !empty($bookmark->link_url) )
-                       $the_link = clean_url($bookmark->link_url);
+                       $the_link = esc_url($bookmark->link_url);
 
-               $rel = $bookmark->link_rel;
-               if ( '' != $rel )
-                       $rel = ' rel="' . $rel . '"';
-
-               $desc = attribute_escape(sanitize_bookmark_field('link_description', $bookmark->link_description, $bookmark->link_id, 'display'));
-               $name = attribute_escape(sanitize_bookmark_field('link_name', $bookmark->link_name, $bookmark->link_id, 'display'));
+               $desc = esc_attr(sanitize_bookmark_field('link_description', $bookmark->link_description, $bookmark->link_id, 'display'));
+               $name = esc_attr(sanitize_bookmark_field('link_name', $bookmark->link_name, $bookmark->link_id, 'display'));
                $title = $desc;
 
                if ( $show_updated )
@@ -87,26 +83,31 @@ function _walk_bookmarks($bookmarks, $args = '' ) {
                                $title .= ')';
                        }
 
+               $alt = ' alt="' . $name . ( $show_description ? ' ' . $title : '' ) . '"';
+
                if ( '' != $title )
                        $title = ' title="' . $title . '"';
 
-               $alt = ' alt="' . $name . '"';
+               $rel = $bookmark->link_rel;
+               if ( '' != $rel )
+                       $rel = ' rel="' . esc_attr($rel) . '"';
 
                $target = $bookmark->link_target;
                if ( '' != $target )
                        $target = ' target="' . $target . '"';
 
-               $output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
+               $output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
 
                $output .= $link_before;
 
                if ( $bookmark->link_image != null && $show_images ) {
-                       if ( strpos($bookmark->link_image, 'http') !== false )
+                       if ( strpos($bookmark->link_image, 'http') === 0 )
                                $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
                        else // If it's a relative path
                                $output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
 
-                       if ($show_name) $output .= $name;
+                       if ( $show_name )
+                               $output .= " $name";
                } else {
                        $output .= $name;
                }
@@ -121,9 +122,8 @@ function _walk_bookmarks($bookmarks, $args = '' ) {
                if ( $show_description && '' != $desc )
                        $output .= $between . $desc;
 
-               if ($show_rating) {
+               if ( $show_rating )
                        $output .= $between . sanitize_bookmark_field('link_rating', $bookmark->link_rating, $bookmark->link_id, 'display');
-               }
 
                $output .= "$after\n";
        } // end while
@@ -153,6 +153,8 @@ function _walk_bookmarks($bookmarks, $args = '' ) {
  *             formatted bookmarks.
  * 'categorize' - Default is 1 (integer). Whether to show links listed by
  *             category (default) or show links in one column.
+ * 'show_description' - Default is 0 (integer). Whether to show the description
+ *             of the bookmark.
  *
  * These options define how the Category name will appear before the category
  * links are displayed, if 'categorize' is 1. If 'categorize' is 0, then it will