<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14239] trunk/wp-includes/bookmark.php:
Fix array handling in sanitize_bookmark_field().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14239">14239</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-26 14:10:12 +0000 (Mon, 26 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix array handling in sanitize_bookmark_field(). Props mdawaffe. fixes <a href="http://trac.wordpress.org/ticket/13098">#13098</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesbookmarkphp">trunk/wp-includes/bookmark.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/bookmark.php (14238 => 14239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/bookmark.php 2010-04-26 11:17:12 UTC (rev 14238)
+++ trunk/wp-includes/bookmark.php 2010-04-26 14:10:12 UTC (rev 14239)
</span><span class="lines">@@ -309,25 +309,25 @@
</span><span class="cx"> * @return mixed The filtered value
</span><span class="cx"> */
</span><span class="cx"> function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
</span><del>- $int_fields = array('link_id', 'link_rating');
- if ( in_array($field, $int_fields) )
</del><ins>+ switch ( $field ) {
+ case 'link_id' : // ints
+ case 'link_rating' :
</ins><span class="cx"> $value = (int) $value;
</span><del>-
- // Fields which contain arrays of ints.
- $array_int_fields = array( 'link_category' );
- if ( in_array($field, $array_int_fields) ) {
- $value = array_map( 'absint', $value);
</del><ins>+ break;
+ case 'link_category' : // array( ints )
+ $value = array_map('absint', (array) $value);
+ // We return here so that the categories aren't filtered.
+ // The 'link_category' filter is for the name of a link category, not an array of a link's link categories
</ins><span class="cx"> return $value;
</span><del>- }
-
- $yesno = array('link_visible');
- if ( in_array($field, $yesno) )
</del><ins>+ break;
+ case 'link_visible' : // bool stored as Y|N
</ins><span class="cx"> $value = preg_replace('/[^YNyn]/', '', $value);
</span><del>-
- if ( 'link_target' == $field ) {
</del><ins>+ break;
+ case 'link_target' : // "enum"
</ins><span class="cx"> $targets = array('_top', '_blank');
</span><span class="cx"> if ( ! in_array($value, $targets) )
</span><span class="cx"> $value = '';
</span><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'raw' == $context )
</span><span class="lines">@@ -347,13 +347,13 @@
</span><span class="cx"> } else {
</span><span class="cx"> // Use display filters by default.
</span><span class="cx"> $value = apply_filters($field, $value, $bookmark_id, $context);
</span><ins>+
+ if ( 'attribute' == $context )
+ $value = esc_attr($value);
+ else if ( 'js' == $context )
+ $value = esc_js($value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 'attribute' == $context )
- $value = esc_attr($value);
- else if ( 'js' == $context )
- $value = esc_js($value);
-
</del><span class="cx"> return $value;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>