<!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>[28374] trunk: Eliminate use of `extract()` in `wp_insert_category()`.</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/28374">28374</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-13 03:26:51 +0000 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `wp_insert_category()`. Adds unit tests. All unit tests pass.
Props MikeHansenMe.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludestaxonomyphp">trunk/src/wp-admin/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="trunksrcwpadminincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/taxonomy.php (28373 => 28374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/taxonomy.php 2014-05-13 03:13:21 UTC (rev 28373)
+++ trunk/src/wp-admin/includes/taxonomy.php 2014-05-13 03:26:51 UTC (rev 28374)
</span><span class="lines">@@ -89,53 +89,53 @@
</span><span class="cx"> * @param bool $wp_error Optional, since 2.5.0. Set this to true if the caller handles WP_Error return values.
</span><span class="cx"> * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure, depending on param $wp_error.
</span><span class="cx"> */
</span><del>-function wp_insert_category($catarr, $wp_error = false) {
- $cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
- $catarr = wp_parse_args($catarr, $cat_defaults);
- extract($catarr, EXTR_SKIP);
</del><ins>+function wp_insert_category( $catarr, $wp_error = false ) {
+ $cat_defaults = array( 'cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '' );
+ $catarr = wp_parse_args( $catarr, $cat_defaults );
</ins><span class="cx">
</span><del>- if ( trim( $cat_name ) == '' ) {
- if ( ! $wp_error )
</del><ins>+ if ( trim( $catarr['cat_name'] ) == '' ) {
+ if ( ! $wp_error ) {
</ins><span class="cx"> return 0;
</span><del>- else
- return new WP_Error( 'cat_name', __('You did not enter a category name.') );
</del><ins>+ } else {
+ return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $cat_ID = (int) $cat_ID;
</del><ins>+ $catarr['cat_ID'] = (int) $catarr['cat_ID'];
</ins><span class="cx">
</span><span class="cx"> // Are we updating or creating?
</span><del>- if ( !empty ($cat_ID) )
- $update = true;
- else
- $update = false;
</del><ins>+ $update = ! empty ( $catarr['cat_ID'] );
</ins><span class="cx">
</span><del>- $name = $cat_name;
- $description = $category_description;
- $slug = $category_nicename;
- $parent = $category_parent;
-
- $parent = (int) $parent;
- if ( $parent < 0 )
</del><ins>+ $name = $catarr['cat_name'];
+ $description = $catarr['category_description'];
+ $slug = $catarr['category_nicename'];
+ $parent = (int) $catarr['category_parent'];
+ if ( $parent < 0 ) {
</ins><span class="cx"> $parent = 0;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( empty( $parent ) || ! term_exists( $parent, $taxonomy ) || ( $cat_ID && term_is_ancestor_of( $cat_ID, $parent, $taxonomy ) ) )
</del><ins>+ if ( empty( $parent )
+ || ! term_exists( $parent, $catarr['taxonomy'] )
+ || ( $catarr['cat_ID'] && term_is_ancestor_of( $catarr['cat_ID'], $parent, $catarr['taxonomy'] ) ) ) {
</ins><span class="cx"> $parent = 0;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $args = compact('name', 'slug', 'parent', 'description');
</span><span class="cx">
</span><del>- if ( $update )
- $cat_ID = wp_update_term($cat_ID, $taxonomy, $args);
- else
- $cat_ID = wp_insert_term($cat_name, $taxonomy, $args);
</del><ins>+ if ( $update ) {
+ $catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args );
+ } else {
+ $catarr['cat_ID'] = wp_insert_term( $catarr['cat_name'], $catarr['taxonomy'], $args );
+ }
</ins><span class="cx">
</span><del>- if ( is_wp_error($cat_ID) ) {
- if ( $wp_error )
- return $cat_ID;
- else
</del><ins>+ if ( is_wp_error( $catarr['cat_ID'] ) ) {
+ if ( $wp_error ) {
+ return $catarr['cat_ID'];
+ } else {
</ins><span class="cx"> return 0;
</span><ins>+ }
</ins><span class="cx"> }
</span><del>-
- return $cat_ID['term_id'];
</del><ins>+ return $catarr['cat_ID']['term_id'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/taxonomy.php (28373 => 28374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/taxonomy.php 2014-05-13 03:13:21 UTC (rev 28373)
+++ trunk/tests/phpunit/tests/taxonomy.php 2014-05-13 03:26:51 UTC (rev 28374)
</span><span class="lines">@@ -168,4 +168,40 @@
</span><span class="cx"> wp_set_object_terms( $post->ID, $term['term_id'], 'category' );
</span><span class="cx"> $this->assertTrue( in_category( $term['term_id'], $post ) );
</span><span class="cx"> }
</span><ins>+
+ function test_insert_category_create() {
+ $cat = array(
+ 'cat_ID' => 0,
+ 'taxonomy' => 'category',
+ 'cat_name' => 'test1'
+ );
+ $this->assertTrue( is_numeric( wp_insert_category( $cat, true ) ) );
+ }
+
+ function test_insert_category_update() {
+ $cat = array(
+ 'cat_ID' => 1,
+ 'taxonomy' => 'category',
+ 'cat_name' => 'Updated Name'
+ );
+ $this->assertEquals( 1, wp_insert_category( $cat ) );
+ }
+
+ function test_insert_category_force_error_handle() {
+ $cat = array(
+ 'cat_ID' => 0,
+ 'taxonomy' => 'force_error',
+ 'cat_name' => 'Error'
+ );
+ $this->assertTrue( is_a( wp_insert_category( $cat, true ), 'WP_Error' ) );
+ }
+
+ function test_insert_category_force_error_no_handle() {
+ $cat = array(
+ 'cat_ID' => 0,
+ 'taxonomy' => 'force_error',
+ 'cat_name' => 'Error'
+ );
+ $this->assertEquals( 0, wp_insert_category( $cat, false ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>