Changeset 10712 for trunk/wp-includes/bookmark-template.php

Timestamp:

03/04/2009 11:49:21 PM (16 years ago)

Author:

ryan

Message:

Links widget options. Props DD32. see #9196

File:

• trunk/wp-includes/bookmark-template.php (modified) (4 diffs)

trunk/wp-includes/bookmark-template.php

@@ -73 +73 @@
             $the_link = clean_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'));
@@ -88 +84 @@
             }
 
+        $alt = ' alt="' . $name . ( $show_description ? ' ' . $title : '' ) . '"';
+
         if ( '' != $title )
             $title = ' title="' . $title . '"';
 
-        $alt = ' alt="' . $name . '"';
+        $rel = $bookmark->link_rel;
+        if ( '' != $rel )
+            $rel = ' rel="' . $rel . '"';
 
         $target = $bookmark->link_target;
@@ -97 +97 @@
             $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
@@ -122 +122 @@
             $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";