Ticket #50561: 50561.2.diff

src/wp-includes/bookmark-template.php

@@ -50 +50 @@
  */
 function _walk_bookmarks( $bookmarks, $args = '' ) {
         $defaults = array(
-                'show_updated'     => 0,
+                'show_updated'     => 0, // Unused.
                 'show_description' => 0,
                 'show_images'      => 1,
                 'show_name'        => 0,
@@ -67 +67 @@
         $output = ''; // Blank string to start with.
 
         foreach ( (array) $bookmarks as $bookmark ) {
-                if ( ! isset( $bookmark->recently_updated ) ) {
-                        $bookmark->recently_updated = false;
-                }
                 $output .= $parsed_args['before'];
-                if ( $parsed_args['show_updated'] && $bookmark->recently_updated ) {
-                        $output .= '<em>';
-                }
                 $the_link = '#';
                 if ( ! empty( $bookmark->link_url ) ) {
                         $the_link = esc_url( $bookmark->link_url );
@@ -80 +74 @@
                 }
                 $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 ( $parsed_args['show_updated'] ) {
-                        if ( '00' !== substr( $bookmark->link_updated_f, 0, 2 ) ) {
-                                $title .= ' (';
-                                $title .= sprintf(
-                                        /* translators: %s: Date and time of last update. */
-                                        __( 'Last updated: %s' ),
-                                        gmdate(
-                                                get_option( 'links_updated_date_format' ),
-                                                $bookmark->link_updated_f + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS )
-                                        )
-                                );
-                                $title .= ')';
-                        }
-                }
-                $alt = ' alt="' . $name . ( $parsed_args['show_description'] ? ' ' . $title : '' ) . '"';
-
-                if ( '' !== $title ) {
-                        $title = ' title="' . $title . '"';
-                }
                 $rel = $bookmark->link_rel;
                 if ( '' !== $rel ) {
                         $rel = ' rel="' . esc_attr( $rel ) . '"';
@@ -109 +83 @@
                 if ( '' !== $target ) {
                         $target = ' target="' . $target . '"';
                 }
-                $output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
+                $output .= '<a href="' . $the_link . '"' . $rel . $target . '>';
 
                 $output .= $parsed_args['link_before'];
 
                 if ( null != $bookmark->link_image && $parsed_args['show_images'] ) {
-                        if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
-                                $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
+                        if ( 0 === strpos( $bookmark->link_image, 'http' ) ) {
+                                $linked_image = $bookmark->link_image;
                         } else { // If it's a relative path.
-                                $output .= '<img src="' . get_option( 'siteurl' ) . "$bookmark->link_image\" $alt $title />";
+                                $linked_image = site_url( $bookmark->link_image );
                         }
                         if ( $parsed_args['show_name'] ) {
-                                $output .= " $name";
+                                $output .= '<img src="' . $linked_image . '" alt="" /> ' . $name;
+                        } else {
+                                $output .= '<img src="' . $linked_image . '" alt="' . $name . '" />';
                         }
                 } else {
                         $output .= $name;
@@ -130 +106 @@
 
                 $output .= '</a>';
 
-                if ( $parsed_args['show_updated'] && $bookmark->recently_updated ) {
-                        $output .= '</em>';
-                }
-
                 if ( $parsed_args['show_description'] && '' !== $desc ) {
                         $output .= $parsed_args['between'] . $desc;
                 }