
<!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>[17688] trunk/wp-includes/taxonomy.php: Prevent $taxonony-&gt;

 object_type containing duplicate values.</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17688">17688</a></dd>

<dt>Author</dt> <dd>dd32</dd>

<dt>Date</dt> <dd>2011-04-23 09:27:37 +0000 (Sat, 23 Apr 2011)</dd>

</dl>


<h3>Log Message</h3>

<pre>Prevent $taxonony-&gt;object_type containing duplicate values. Initial patch props kevinB. Fixes <a href="http://trac.wordpress.org/ticket/16951">#16951</a></pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpincludestaxonomyphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (17687 => 17688)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-includes/taxonomy.php        2011-04-23 02:12:56 UTC (rev 17687)

+++ trunk/wp-includes/taxonomy.php        2011-04-23 09:27:37 UTC (rev 17688)

</span><span class="lines">@@ -354,7 +354,7 @@

</span><span class="cx">         unset( $args['capabilities'] );

</span><span class="cx"> 

</span><span class="cx">         $args['name'] = $taxonomy;

</span><del>-        $args['object_type'] = (array) $object_type;

</del><ins>+        $args['object_type'] =  array_unique( (array)$object_type );

</ins><span class="cx"> 

</span><span class="cx">         $args['labels'] = get_taxonomy_labels( (object) $args );

</span><span class="cx">         $args['label'] = $args['labels']-&gt;name;

</span><span class="lines">@@ -437,7 +437,8 @@

</span><span class="cx">         if ( ! get_post_type_object($object_type) )

</span><span class="cx">                 return false;

</span><span class="cx"> 

</span><del>-        $wp_taxonomies[$taxonomy]-&gt;object_type[] = $object_type;

</del><ins>+        if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]-&gt;object_type ) )

+                $wp_taxonomies[$taxonomy]-&gt;object_type[] = $object_type;

</ins><span class="cx"> 

</span><span class="cx">         return true;

</span><span class="cx"> }

</span></span></pre>

</div>

</div>


</body>

</html>