<!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>[28403] trunk/src/wp-includes/bookmark.php: Eliminate use of `extract()` in `get_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/28403">28403</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 01:57:24 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `get_bookmarks()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesbookmarkphp">trunk/src/wp-includes/bookmark.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/bookmark.php (28402 => 28403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/bookmark.php 2014-05-15 01:40:48 UTC (rev 28402)
+++ trunk/src/wp-includes/bookmark.php 2014-05-15 01:57:24 UTC (rev 28403)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> * @param string|array $args List of arguments to overwrite the defaults
</span><span class="cx"> * @return array List of bookmark row objects
</span><span class="cx"> */
</span><del>-function get_bookmarks($args = '') {
</del><ins>+function get_bookmarks( $args = '' ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="lines">@@ -130,11 +130,10 @@
</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"> $key = md5( serialize( $r ) );
</span><span class="cx"> if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
</span><del>- if ( is_array($cache) && isset( $cache[ $key ] ) ) {
</del><ins>+ if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
</ins><span class="cx"> $bookmarks = $cache[ $key ];
</span><span class="cx"> /**
</span><span class="cx"> * Filter the returned list of bookmarks.
</span><span class="lines">@@ -155,45 +154,50 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !is_array($cache) )
</del><ins>+ if ( ! is_array( $cache ) ) {
</ins><span class="cx"> $cache = array();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $inclusions = '';
</span><del>- if ( !empty($include) ) {
- $exclude = ''; //ignore exclude, category, and category_name params if using include
- $category = '';
- $category_name = '';
- $inclinks = preg_split('/[\s,]+/',$include);
- if ( count($inclinks) ) {
</del><ins>+ if ( ! empty( $r['include'] ) ) {
+ $r['exclude'] = ''; //ignore exclude, category, and category_name params if using include
+ $r['category'] = '';
+ $r['category_name'] = '';
+ $inclinks = preg_split( '/[\s,]+/', $r['include'] );
+ if ( count( $inclinks ) ) {
</ins><span class="cx"> foreach ( $inclinks as $inclink ) {
</span><del>- if (empty($inclusions))
- $inclusions = ' AND ( link_id = ' . intval($inclink) . ' ';
- else
- $inclusions .= ' OR link_id = ' . intval($inclink) . ' ';
</del><ins>+ if ( empty( $inclusions ) ) {
+ $inclusions = ' AND ( link_id = ' . intval( $inclink ) . ' ';
+ } else {
+ $inclusions .= ' OR link_id = ' . intval( $inclink ) . ' ';
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (!empty($inclusions))
</del><ins>+ if (! empty( $inclusions ) ) {
</ins><span class="cx"> $inclusions .= ')';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $exclusions = '';
</span><del>- if ( !empty($exclude) ) {
- $exlinks = preg_split('/[\s,]+/',$exclude);
- if ( count($exlinks) ) {
</del><ins>+ if ( ! empty( $r['exclude'] ) ) {
+ $exlinks = preg_split( '/[\s,]+/', $r['exclude'] );
+ if ( count( $exlinks ) ) {
</ins><span class="cx"> foreach ( $exlinks as $exlink ) {
</span><del>- if (empty($exclusions))
- $exclusions = ' AND ( link_id <> ' . intval($exlink) . ' ';
- else
- $exclusions .= ' AND link_id <> ' . intval($exlink) . ' ';
</del><ins>+ if ( empty( $exclusions ) ) {
+ $exclusions = ' AND ( link_id <> ' . intval( $exlink ) . ' ';
+ } else {
+ $exclusions .= ' AND link_id <> ' . intval( $exlink ) . ' ';
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (!empty($exclusions))
</del><ins>+ if ( ! empty( $exclusions ) ) {
</ins><span class="cx"> $exclusions .= ')';
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( !empty($category_name) ) {
- if ( $category = get_term_by('name', $category_name, 'link_category') ) {
- $category = $category->term_id;
</del><ins>+ if ( ! empty( $r['category_name'] ) ) {
+ if ( $r['category'] = get_term_by('name', $r['category_name'], 'link_category') ) {
+ $r['category'] = $r['category']->term_id;
</ins><span class="cx"> } else {
</span><span class="cx"> $cache[ $key ] = array();
</span><span class="cx"> wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
</span><span class="lines">@@ -202,38 +206,40 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! empty($search) ) {
- $search = esc_sql( like_escape( $search ) );
</del><ins>+ $search = '';
+ if ( ! empty( $r['search'] ) ) {
+ $search = esc_sql( like_escape( $r['search'] ) );
</ins><span class="cx"> $search = " AND ( (link_url LIKE '%$search%') OR (link_name LIKE '%$search%') OR (link_description LIKE '%$search%') ) ";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $category_query = '';
</span><span class="cx"> $join = '';
</span><del>- if ( !empty($category) ) {
- $incategories = preg_split('/[\s,]+/',$category);
</del><ins>+ if ( ! empty( $r['category'] ) ) {
+ $incategories = preg_split( '/[\s,]+/', $r['category'] );
</ins><span class="cx"> if ( count($incategories) ) {
</span><span class="cx"> foreach ( $incategories as $incat ) {
</span><del>- if (empty($category_query))
- $category_query = ' AND ( tt.term_id = ' . intval($incat) . ' ';
- else
- $category_query .= ' OR tt.term_id = ' . intval($incat) . ' ';
</del><ins>+ if ( empty( $category_query ) ) {
+ $category_query = ' AND ( tt.term_id = ' . intval( $incat ) . ' ';
+ } else {
+ $category_query .= ' OR tt.term_id = ' . intval( $incat ) . ' ';
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (!empty($category_query)) {
</del><ins>+ if ( ! empty( $category_query ) ) {
</ins><span class="cx"> $category_query .= ") AND taxonomy = 'link_category'";
</span><span class="cx"> $join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $show_updated ) {
</del><ins>+ if ( $r['show_updated'] ) {
</ins><span class="cx"> $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ";
</span><span class="cx"> } else {
</span><span class="cx"> $recently_updated_test = '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $get_updated = ( $show_updated ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
</del><ins>+ $get_updated = ( $r['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
</ins><span class="cx">
</span><del>- $orderby = strtolower($orderby);
</del><ins>+ $orderby = strtolower( $r['orderby'] );
</ins><span class="cx"> $length = '';
</span><span class="cx"> switch ( $orderby ) {
</span><span class="cx"> case 'length':
</span><span class="lines">@@ -247,35 +253,41 @@
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> $orderparams = array();
</span><del>- foreach ( explode(',', $orderby) as $ordparam ) {
- $ordparam = trim($ordparam);
- $keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes' );
- if ( in_array( 'link_' . $ordparam, $keys ) )
</del><ins>+ $keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes' );
+ foreach ( explode( ',', $orderby ) as $ordparam ) {
+ $ordparam = trim( $ordparam );
+
+ if ( in_array( 'link_' . $ordparam, $keys ) ) {
</ins><span class="cx"> $orderparams[] = 'link_' . $ordparam;
</span><del>- elseif ( in_array( $ordparam, $keys ) )
</del><ins>+ } elseif ( in_array( $ordparam, $keys ) ) {
</ins><span class="cx"> $orderparams[] = $ordparam;
</span><ins>+ }
</ins><span class="cx"> }
</span><del>- $orderby = implode(',', $orderparams);
</del><ins>+ $orderby = implode( ',', $orderparams );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty( $orderby ) )
</del><ins>+ if ( empty( $orderby ) ) {
</ins><span class="cx"> $orderby = 'link_name';
</span><ins>+ }
</ins><span class="cx">
</span><del>- $order = strtoupper( $order );
- if ( '' !== $order && !in_array( $order, array( 'ASC', 'DESC' ) ) )
</del><ins>+ $order = strtoupper( $r['order'] );
+ if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
</ins><span class="cx"> $order = 'ASC';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $visible = '';
</span><del>- if ( $hide_invisible )
</del><ins>+ if ( $r['hide_invisible'] ) {
</ins><span class="cx"> $visible = "AND link_visible = 'Y'";
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
</span><span class="cx"> $query .= " $exclusions $inclusions $search";
</span><span class="cx"> $query .= " ORDER BY $orderby $order";
</span><del>- if ($limit != -1)
- $query .= " LIMIT $limit";
</del><ins>+ if ( $r['limit'] != -1 ) {
+ $query .= ' LIMIT ' . $r['limit'];
+ }
</ins><span class="cx">
</span><del>- $results = $wpdb->get_results($query);
</del><ins>+ $results = $wpdb->get_results( $query );
</ins><span class="cx">
</span><span class="cx"> $cache[ $key ] = $results;
</span><span class="cx"> wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
</span><span class="lines">@@ -355,7 +367,7 @@
</span><span class="cx"> // We return here so that the categories aren't filtered.
</span><span class="cx"> // The 'link_category' filter is for the name of a link category, not an array of a link's link categories
</span><span class="cx"> return $value;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'link_visible' : // bool stored as Y|N
</span><span class="cx"> $value = preg_replace('/[^YNyn]/', '', $value);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>