<!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>[25596] trunk: Introduce register_taxonomy_for_object_type().</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/25596">25596</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-09-24 02:54:00 +0000 (Tue, 24 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce register_taxonomy_for_object_type().
props leewillis77.
fixes <a href="http://core.trac.wordpress.org/ticket/11058">#11058</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/taxonomy.php (25595 => 25596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2013-09-24 02:49:30 UTC (rev 25595)
+++ trunk/src/wp-includes/taxonomy.php 2013-09-24 02:54:00 UTC (rev 25596)
</span><span class="lines">@@ -507,6 +507,32 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Remove an already registered taxonomy from an object type.
+ *
+ * @since 3.7.0
+ *
+ * @param string $taxonomy Name of taxonomy object.
+ * @param string $object_type Name of the object type.
+ * @return bool True if successful, false if not.
+ */
+function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
+ global $wp_taxonomies;
+
+ if ( ! isset( $wp_taxonomies[ $taxonomy ] ) )
+ return false;
+
+ if ( ! get_post_type_object( $object_type ) )
+ return false;
+
+ $key = array_search( $object_type, $wp_taxonomies[ $taxonomy ]->object_type, true );
+ if ( false === $key )
+ return false;
+
+ unset( $wp_taxonomies[ $taxonomy ]->object_type[ $key ] );
+ return true;
+}
+
</ins><span class="cx"> //
</span><span class="cx"> // Term API
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/taxonomy.php (25595 => 25596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/taxonomy.php 2013-09-24 02:49:30 UTC (rev 25595)
+++ trunk/tests/phpunit/tests/taxonomy.php 2013-09-24 02:54:00 UTC (rev 25596)
</span><span class="lines">@@ -103,4 +103,53 @@
</span><span class="cx"> function test_register_long_taxonomy() {
</span><span class="cx"> $this->assertInstanceOf( 'WP_Error', register_taxonomy( 'abcdefghijklmnopqrstuvwxyz0123456789', 'post', array() ) );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 11058
+ */
+ function test_registering_taxonomies_to_object_types() {
+ // Create a taxonomy to test with
+ $tax = 'test_tax';
+ $this->assertFalse( taxonomy_exists($tax) );
+ register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
+
+ // Create a post type to test with
+ $post_type = 'test_cpt';
+ $this->assertFalse( get_post_type( $post_type ) );
+ $this->assertObjectHasAttribute( 'name', register_post_type( $post_type ) );
+
+ // Core taxonomy, core post type
+ $this->assertTrue( unregister_taxonomy_for_object_type( 'category', 'post' ) );
+ $this->assertFalse( unregister_taxonomy_for_object_type( 'category', 'post' ) );
+ $this->assertTrue( register_taxonomy_for_object_type( 'category', 'post' ) );
+
+ // Core taxonomy, non-core post type
+ $this->assertTrue( register_taxonomy_for_object_type( 'category', $post_type ) );
+ $this->assertTrue( unregister_taxonomy_for_object_type( 'category', $post_type ) );
+ $this->assertFalse( unregister_taxonomy_for_object_type( 'category', $post_type ) );
+ $this->assertTrue( register_taxonomy_for_object_type( 'category', $post_type ) );
+
+ // Core taxonomies, non-post object types
+ $this->assertFalse( register_taxonomy_for_object_type( 'category', 'user' ) );
+ $this->assertFalse( unregister_taxonomy_for_object_type( 'category', 'user' ) );
+
+ // Non-core taxonomy, core post type
+ $this->assertTrue( unregister_taxonomy_for_object_type( $tax, 'post' ) );
+ $this->assertFalse( unregister_taxonomy_for_object_type( $tax, 'post' ) );
+ $this->assertTrue( register_taxonomy_for_object_type( $tax, 'post' ) );
+
+ // Non-core taxonomy, non-core post type
+ $this->assertTrue( register_taxonomy_for_object_type( $tax, $post_type ) );
+ $this->assertTrue( unregister_taxonomy_for_object_type( $tax, $post_type ) );
+ $this->assertFalse( unregister_taxonomy_for_object_type( $tax, $post_type ) );
+ $this->assertTrue( register_taxonomy_for_object_type( $tax, $post_type ) );
+
+ // Non-core taxonomies, non-post object types
+ $this->assertFalse( register_taxonomy_for_object_type( $tax, 'user' ) );
+ $this->assertFalse( unregister_taxonomy_for_object_type( $tax, 'user' ) );
+
+ unset($GLOBALS['wp_taxonomies'][$tax]);
+ _unregister_post_type( $post_type );
+
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>