<!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>[20469] trunk/wp-includes/class-wp-xmlrpc-server.php: Move from $taxonomy_name to $taxonomy in XML-RPC for consistency with the rest of the core APIs.</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, #logmsg > ol { margin-left: 0; 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/20469">20469</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-15 16:47:31 +0000 (Sun, 15 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move from $taxonomy_name to $taxonomy in XML-RPC for consistency with the rest of the core APIs. props maxcutler, fixes <a href="http://core.trac.wordpress.org/ticket/20397">#20397</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (20468 => 20469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-04-14 19:58:19 UTC (rev 20468)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-04-15 16:47:31 UTC (rev 20469)
</span><span class="lines">@@ -1438,7 +1438,7 @@
</span><span class="cx"> $blog_id = (int) $args[0];
</span><span class="cx"> $username = $args[1];
</span><span class="cx"> $password = $args[2];
</span><del>- $taxonomy_name = $args[3];
</del><ins>+ $taxonomy = $args[3];
</ins><span class="cx"> $term_id = (int) $args[4];
</span><span class="cx">
</span><span class="cx"> if ( ! $user = $this->login( $username, $password ) )
</span><span class="lines">@@ -1446,15 +1446,15 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'xmlrpc_call', 'wp.deleteTerm' );
</span><span class="cx">
</span><del>- if ( ! taxonomy_exists( $taxonomy_name ) )
</del><ins>+ if ( ! taxonomy_exists( $taxonomy ) )
</ins><span class="cx"> return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
</span><span class="cx">
</span><del>- $taxonomy = get_taxonomy( $taxonomy_name );
</del><ins>+ $taxonomy = get_taxonomy( $taxonomy );
</ins><span class="cx">
</span><span class="cx"> if ( ! current_user_can( $taxonomy->cap->delete_terms ) )
</span><span class="cx"> return new IXR_Error( 401, __( 'You are not allowed to delete terms in this taxonomy.' ) );
</span><span class="cx">
</span><del>- $term = get_term( $term_id, $taxonomy_name );
</del><ins>+ $term = get_term( $term_id, $taxonomy->name );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $term ) )
</span><span class="cx"> return new IXR_Error( 500, $term->get_error_message() );
</span><span class="lines">@@ -1462,7 +1462,7 @@
</span><span class="cx"> if ( ! $term )
</span><span class="cx"> return new IXR_Error( 404, __( 'Invalid term ID.' ) );
</span><span class="cx">
</span><del>- $result = wp_delete_term( $term_id, $taxonomy_name );
</del><ins>+ $result = wp_delete_term( $term_id, $taxonomy->name );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $result ) )
</span><span class="cx"> return new IXR_Error( 500, $term->get_error_message() );
</span><span class="lines">@@ -1481,7 +1481,7 @@
</span><span class="cx"> * - int $blog_id
</span><span class="cx"> * - string $username
</span><span class="cx"> * - string $password
</span><del>- * - string $taxonomy_name
</del><ins>+ * - string $taxonomy
</ins><span class="cx"> * - string $term_id
</span><span class="cx"> * @return array contains:
</span><span class="cx"> * - 'term_id'
</span><span class="lines">@@ -1500,7 +1500,7 @@
</span><span class="cx"> $blog_id = (int) $args[0];
</span><span class="cx"> $username = $args[1];
</span><span class="cx"> $password = $args[2];
</span><del>- $taxonomy_name = $args[3];
</del><ins>+ $taxonomy = $args[3];
</ins><span class="cx"> $term_id = (int) $args[4];
</span><span class="cx">
</span><span class="cx"> if ( ! $user = $this->login( $username, $password ) )
</span><span class="lines">@@ -1508,15 +1508,15 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'xmlrpc_call', 'wp.getTerm' );
</span><span class="cx">
</span><del>- if ( ! taxonomy_exists( $taxonomy_name ) )
</del><ins>+ if ( ! taxonomy_exists( $taxonomy ) )
</ins><span class="cx"> return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
</span><span class="cx">
</span><del>- $taxonomy = get_taxonomy( $taxonomy_name );
</del><ins>+ $taxonomy = get_taxonomy( $taxonomy );
</ins><span class="cx">
</span><span class="cx"> if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
</span><span class="cx"> return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
</span><span class="cx">
</span><del>- $term = get_term( $term_id , $taxonomy_name, ARRAY_A );
</del><ins>+ $term = get_term( $term_id , $taxonomy->name, ARRAY_A );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $term ) )
</span><span class="cx"> return new IXR_Error( 500, $term->get_error_message() );
</span><span class="lines">@@ -1538,7 +1538,7 @@
</span><span class="cx"> * - int $blog_id
</span><span class="cx"> * - string $username
</span><span class="cx"> * - string $password
</span><del>- * - string $taxonomy_name
</del><ins>+ * - string $taxonomy
</ins><span class="cx"> * - array $filter optional
</span><span class="cx"> * @return array terms
</span><span class="cx"> */
</span><span class="lines">@@ -1548,7 +1548,7 @@
</span><span class="cx"> $blog_id = (int) $args[0];
</span><span class="cx"> $username = $args[1];
</span><span class="cx"> $password = $args[2];
</span><del>- $taxonomy_name = $args[3];
</del><ins>+ $taxonomy = $args[3];
</ins><span class="cx"> $filter = isset( $args[4] ) ? $args[4] : array();
</span><span class="cx">
</span><span class="cx"> if ( ! $user = $this->login( $username, $password ) )
</span><span class="lines">@@ -1556,10 +1556,10 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'xmlrpc_call', 'wp.getTerms' );
</span><span class="cx">
</span><del>- if ( ! taxonomy_exists( $taxonomy_name ) )
</del><ins>+ if ( ! taxonomy_exists( $taxonomy ) )
</ins><span class="cx"> return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
</span><span class="cx">
</span><del>- $taxonomy = get_taxonomy( $taxonomy_name );
</del><ins>+ $taxonomy = get_taxonomy( $taxonomy );
</ins><span class="cx">
</span><span class="cx"> if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
</span><span class="cx"> return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
</span><span class="lines">@@ -1587,7 +1587,7 @@
</span><span class="cx"> if ( isset( $filter['search'] ) )
</span><span class="cx"> $query['search'] = $filter['search'];
</span><span class="cx">
</span><del>- $terms = get_terms( $taxonomy_name, $query );
</del><ins>+ $terms = get_terms( $taxonomy->name, $query );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $terms ) )
</span><span class="cx"> return new IXR_Error( 500, $terms->get_error_message() );
</span><span class="lines">@@ -1609,7 +1609,7 @@
</span><span class="cx"> * - int $blog_id
</span><span class="cx"> * - string $username
</span><span class="cx"> * - string $password
</span><del>- * - string $taxonomy_name
</del><ins>+ * - string $taxonomy
</ins><span class="cx"> * @return array (@see get_taxonomy())
</span><span class="cx"> */
</span><span class="cx"> function wp_getTaxonomy( $args ) {
</span><span class="lines">@@ -1618,17 +1618,17 @@
</span><span class="cx"> $blog_id = (int) $args[0];
</span><span class="cx"> $username = $args[1];
</span><span class="cx"> $password = $args[2];
</span><del>- $taxonomy_name = $args[3];
</del><ins>+ $taxonomy = $args[3];
</ins><span class="cx">
</span><span class="cx"> if ( ! $user = $this->login( $username, $password ) )
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> do_action( 'xmlrpc_call', 'wp.getTaxonomy' );
</span><span class="cx">
</span><del>- if ( ! taxonomy_exists( $taxonomy_name ) )
</del><ins>+ if ( ! taxonomy_exists( $taxonomy ) )
</ins><span class="cx"> return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
</span><span class="cx">
</span><del>- $taxonomy = get_taxonomy( $taxonomy_name );
</del><ins>+ $taxonomy = get_taxonomy( $taxonomy );
</ins><span class="cx">
</span><span class="cx"> if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
</span><span class="cx"> return new IXR_Error( 401, __( 'You are not allowed to assign terms in this taxonomy.' ) );
</span></span></pre>
</div>
</div>
</body>
</html>