<!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>[13088] trunk/wp-admin/admin-ajax.php:
Flow on tax-modification errors on Tax inline edit to the UI.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13088">13088</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-13 06:04:54 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Flow on tax-modification errors on Tax inline edit to the UI. See <a href="http://trac.wordpress.org/ticket/11838">#11838</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (13087 => 13088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-02-13 05:52:27 UTC (rev 13087)
+++ trunk/wp-admin/admin-ajax.php 2010-02-13 06:04:54 UTC (rev 13088)
</span><span class="lines">@@ -1131,25 +1131,6 @@
</span><span class="cx"> die(-1);
</span><span class="cx">
</span><span class="cx"> switch ($_POST['tax_type']) {
</span><del>- case 'cat' :
- $data = array();
- $data['cat_ID'] = $id;
- $data['cat_name'] = $_POST['name'];
- $data['category_nicename'] = $_POST['slug'];
- if ( isset($_POST['parent']) && (int) $_POST['parent'] > 0 )
- $data['category_parent'] = $_POST['parent'];
-
- $cat = get_category($id, ARRAY_A);
- $data['category_description'] = $cat['category_description'];
-
- $updated = wp_update_category($data);
-
- if ( $updated && !is_wp_error($updated) )
- echo _cat_row( $updated, 0 );
- else
- die( __('Category not updated.') );
-
- break;
</del><span class="cx"> case 'link-cat' :
</span><span class="cx"> $updated = wp_update_term($id, 'link_category', $_POST);
</span><span class="cx">
</span><span class="lines">@@ -1168,12 +1149,17 @@
</span><span class="cx"> $updated = wp_update_term($id, $taxonomy, $_POST);
</span><span class="cx"> if ( $updated && !is_wp_error($updated) ) {
</span><span class="cx"> $tag = get_term( $updated['term_id'], $taxonomy );
</span><del>- if ( !$tag || is_wp_error( $tag ) )
- die( __('Tag not updated.') );
</del><ins>+ if ( !$tag || is_wp_error( $tag ) ) {
+ if ( is_wp_error($tag) && $tag->get_error_message() )
+ die( $tag->get_error_message() );
+ die( __('Item not updated.') );
+ }
</ins><span class="cx">
</span><del>- echo _tag_row($tag, 0, '', $taxonomy);
</del><ins>+ echo _tag_row($tag, 0, $taxonomy);
</ins><span class="cx"> } else {
</span><del>- die( __('Tag not updated.') );
</del><ins>+ if ( is_wp_error($updated) && $updated->get_error_message() )
+ die( $updated->get_error_message() );
+ die( __('Item not updated.') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>