<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28404] trunk/src/wp-includes/bookmark-template.php: Eliminate use of `extract()` in `_walk_bookmarks()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28404">28404</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 02:04:50 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `_walk_bookmarks()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesbookmarktemplatephp">trunk/src/wp-includes/bookmark-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesbookmarktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/bookmark-template.php (28403 => 28404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/bookmark-template.php 2014-05-15 01:57:24 UTC (rev 28403)
+++ trunk/src/wp-includes/bookmark-template.php 2014-05-15 02:04:50 UTC (rev 28404)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> * @param string|array $args Optional. Overwrite the defaults.
</span><span class="cx"> * @return string Formatted output in HTML
</span><span class="cx"> */
</span><del>-function _walk_bookmarks($bookmarks, $args = '' ) {
</del><ins>+function _walk_bookmarks( $bookmarks, $args = '' ) {
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'show_updated' => 0, 'show_description' => 0,
</span><span class="cx"> 'show_images' => 1, 'show_name' => 0,
</span><span class="lines">@@ -56,75 +56,89 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><del>- extract( $r, EXTR_SKIP );
</del><span class="cx">
</span><span class="cx"> $output = ''; // Blank string to start with.
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $bookmarks as $bookmark ) {
</span><del>- if ( !isset($bookmark->recently_updated) )
</del><ins>+ if ( ! isset( $bookmark->recently_updated ) ) {
</ins><span class="cx"> $bookmark->recently_updated = false;
</span><del>- $output .= $before;
- if ( $show_updated && $bookmark->recently_updated )
</del><ins>+ }
+ $output .= $r['before'];
+ if ( $r['show_updated'] && $bookmark->recently_updated ) {
</ins><span class="cx"> $output .= '<em>';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $the_link = '#';
</span><del>- if ( !empty($bookmark->link_url) )
- $the_link = esc_url($bookmark->link_url);
-
- $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'));
</del><ins>+ if ( ! empty( $bookmark->link_url ) ) {
+ $the_link = esc_url( $bookmark->link_url );
+ }
+ $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' ) );
</ins><span class="cx"> $title = $desc;
</span><span class="cx">
</span><del>- if ( $show_updated )
- if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) {
</del><ins>+ if ( $r['show_updated'] ) {
+ if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) {
</ins><span class="cx"> $title .= ' (';
</span><del>- $title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)));
</del><ins>+ $title .= sprintf(
+ __('Last updated: %s'),
+ date(
+ get_option( 'links_updated_date_format' ),
+ $bookmark->link_updated_f + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS )
+ )
+ );
</ins><span class="cx"> $title .= ')';
</span><span class="cx"> }
</span><ins>+ }
+ $alt = ' alt="' . $name . ( $r['show_description'] ? ' ' . $title : '' ) . '"';
</ins><span class="cx">
</span><del>- $alt = ' alt="' . $name . ( $show_description ? ' ' . $title : '' ) . '"';
-
- if ( '' != $title )
</del><ins>+ if ( '' != $title ) {
</ins><span class="cx"> $title = ' title="' . $title . '"';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $rel = $bookmark->link_rel;
</span><del>- if ( '' != $rel )
</del><ins>+ if ( '' != $rel ) {
</ins><span class="cx"> $rel = ' rel="' . esc_attr($rel) . '"';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $target = $bookmark->link_target;
</span><del>- if ( '' != $target )
</del><ins>+ if ( '' != $target ) {
</ins><span class="cx"> $target = ' target="' . $target . '"';
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
</span><span class="cx">
</span><del>- $output .= $link_before;
</del><ins>+ $output .= $r['link_before'];
</ins><span class="cx">
</span><del>- if ( $bookmark->link_image != null && $show_images ) {
- if ( strpos($bookmark->link_image, 'http') === 0 )
</del><ins>+ if ( $bookmark->link_image != null && $r['show_images'] ) {
+ if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
</ins><span class="cx"> $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
</span><del>- else // If it's a relative path
</del><ins>+ } else { // If it's a relative path
</ins><span class="cx"> $output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
</span><del>-
- if ( $show_name )
</del><ins>+ }
+ if ( $r['show_name'] ) {
</ins><span class="cx"> $output .= " $name";
</span><ins>+ }
</ins><span class="cx"> } else {
</span><span class="cx"> $output .= $name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $output .= $link_after;
</del><ins>+ $output .= $r['link_after'];
</ins><span class="cx">
</span><span class="cx"> $output .= '</a>';
</span><span class="cx">
</span><del>- if ( $show_updated && $bookmark->recently_updated )
</del><ins>+ if ( $r['show_updated'] && $bookmark->recently_updated ) {
</ins><span class="cx"> $output .= '</em>';
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( $show_description && '' != $desc )
- $output .= $between . $desc;
</del><ins>+ if ( $r['show_description'] && '' != $desc ) {
+ $output .= $r['between'] . $desc;
+ }
</ins><span class="cx">
</span><del>- if ( $show_rating )
- $output .= $between . sanitize_bookmark_field('link_rating', $bookmark->link_rating, $bookmark->link_id, 'display');
-
- $output .= "$after\n";
</del><ins>+ if ( $r['show_rating'] ) {
+ $output .= $r['between'] . sanitize_bookmark_field(
+ 'link_rating',
+ $bookmark->link_rating,
+ $bookmark->link_id,
+ 'display'
+ );
+ }
+ $output .= $r['$after'] . "\n";
</ins><span class="cx"> } // end while
</span><span class="cx">
</span><span class="cx"> return $output;
</span></span></pre>
</div>
</div>
</body>
</html>