<!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>[28464] trunk/src/wp-includes/taxonomy.php: Eliminate the use of `extract()` in `wp_insert_term()`.</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/28464">28464</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-17 14:15:40 +0000 (Sat, 17 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate the use of `extract()` in `wp_insert_term()`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/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 (28463 => 28464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2014-05-16 22:43:31 UTC (rev 28463)
+++ trunk/src/wp-includes/taxonomy.php 2014-05-17 14:15:40 UTC (rev 28464)
</span><span class="lines">@@ -2364,9 +2364,9 @@
</span><span class="cx"> function wp_insert_term( $term, $taxonomy, $args = array() ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( ! taxonomy_exists($taxonomy) )
</del><ins>+ if ( ! taxonomy_exists($taxonomy) ) {
</ins><span class="cx"> return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
</span><del>-
</del><ins>+ }
</ins><span class="cx"> /**
</span><span class="cx"> * Filter a term before it is sanitized and inserted into the database.
</span><span class="cx"> *
</span><span class="lines">@@ -2376,34 +2376,36 @@
</span><span class="cx"> * @param string $taxonomy Taxonomy slug.
</span><span class="cx"> */
</span><span class="cx"> $term = apply_filters( 'pre_insert_term', $term, $taxonomy );
</span><del>- if ( is_wp_error( $term ) )
- return $term;
-
- if ( is_int($term) && 0 == $term )
</del><ins>+ if ( is_wp_error( $term ) ) {
+ return $term;
+ }
+ if ( is_int($term) && 0 == $term ) {
</ins><span class="cx"> return new WP_Error('invalid_term_id', __('Invalid term ID'));
</span><del>-
- if ( '' == trim($term) )
</del><ins>+ }
+ if ( '' == trim($term) ) {
</ins><span class="cx"> return new WP_Error('empty_term_name', __('A name is required for this term'));
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx"> $args['name'] = $term;
</span><span class="cx"> $args['taxonomy'] = $taxonomy;
</span><span class="cx"> $args = sanitize_term($args, $taxonomy, 'db');
</span><del>- extract($args, EXTR_SKIP);
</del><span class="cx">
</span><span class="cx"> // expected_slashed ($name)
</span><del>- $name = wp_unslash($name);
- $description = wp_unslash($description);
</del><ins>+ $name = wp_unslash( $args['name'] );
+ $description = wp_unslash( $args['description'] );
+ $parent = (int) $args['parent'];
</ins><span class="cx">
</span><del>- $slug_provided = ! empty( $slug );
</del><ins>+ $slug_provided = ! empty( $args['slug'] );
</ins><span class="cx"> if ( ! $slug_provided ) {
</span><span class="cx"> $slug = sanitize_title($name);
</span><ins>+ } else {
+ $slug = $args['slug'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term_group = 0;
</span><del>- if ( $alias_of ) {
- $alias = $wpdb->get_row( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $alias_of) );
</del><ins>+ if ( $args['alias_of'] ) {
+ $alias = $wpdb->get_row( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $args['alias_of'] ) );
</ins><span class="cx"> if ( $alias->term_group ) {
</span><span class="cx"> // The alias we want is already in a group, so let's use that one.
</span><span class="cx"> $term_group = $alias->term_group;
</span><span class="lines">@@ -2439,7 +2441,7 @@
</span><span class="cx"> // We've got an existing term in the same taxonomy, which matches the name of the new term:
</span><span class="cx"> if ( is_taxonomy_hierarchical($taxonomy) && $existing_term['name'] == $name && $exists = term_exists( (int) $term_id, $taxonomy ) ) {
</span><span class="cx"> // Hierarchical, and it matches an existing term, Do not allow same "name" in the same level.
</span><del>- $siblings = get_terms($taxonomy, array('fields' => 'names', 'get' => 'all', 'parent' => (int)$parent) );
</del><ins>+ $siblings = get_terms($taxonomy, array('fields' => 'names', 'get' => 'all', 'parent' => $parent ) );
</ins><span class="cx"> if ( in_array($name, $siblings) ) {
</span><span class="cx"> if ( $slug_provided ) {
</span><span class="cx"> return new WP_Error( 'term_exists', __( 'A term with the name and slug provided already exists with this parent.' ), $exists['term_id'] );
</span><span class="lines">@@ -2448,15 +2450,17 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> $slug = wp_unique_term_slug($slug, (object) $args);
</span><del>- if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
</del><ins>+ if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
</ins><span class="cx"> return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
</span><ins>+ }
</ins><span class="cx"> $term_id = (int) $wpdb->insert_id;
</span><span class="cx"> }
</span><span class="cx"> } elseif ( $existing_term['name'] != $name ) {
</span><span class="cx"> // We've got an existing term, with a different name, Create the new term.
</span><span class="cx"> $slug = wp_unique_term_slug($slug, (object) $args);
</span><del>- if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
</del><ins>+ if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
</ins><span class="cx"> return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
</span><ins>+ }
</ins><span class="cx"> $term_id = (int) $wpdb->insert_id;
</span><span class="cx"> } elseif ( $exists = term_exists( (int) $term_id, $taxonomy ) ) {
</span><span class="cx"> // Same name, same slug.
</span><span class="lines">@@ -2465,8 +2469,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> // This term does not exist at all in the database, Create it.
</span><span class="cx"> $slug = wp_unique_term_slug($slug, (object) $args);
</span><del>- if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
</del><ins>+ if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
</ins><span class="cx"> return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
</span><ins>+ }
</ins><span class="cx"> $term_id = (int) $wpdb->insert_id;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2484,9 +2489,9 @@
</span><span class="cx">
</span><span class="cx"> $tt_id = $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id ) );
</span><span class="cx">
</span><del>- if ( !empty($tt_id) )
</del><ins>+ if ( !empty($tt_id) ) {
</ins><span class="cx"> return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
</span><del>-
</del><ins>+ }
</ins><span class="cx"> $wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent') + array( 'count' => 0 ) );
</span><span class="cx"> $tt_id = (int) $wpdb->insert_id;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>