WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Flow on tax-modification errors on Tax inline edit to the UI. See #11838 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13088 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-13 06:04:54 +00:00
parent d5eac90642
commit 5e339cea52
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-admin/admin-ajax.php
View File

@ -1131,25 +1131,6 @@ case 'inline-save-tax':
die(-1); die(-1);
switch ($_POST['tax_type']) { switch ($_POST['tax_type']) {
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;
case 'link-cat' : case 'link-cat' :
$updated = wp_update_term($id, 'link_category', $_POST); $updated = wp_update_term($id, 'link_category', $_POST);
@ -1168,12 +1149,17 @@ case 'inline-save-tax':
$updated = wp_update_term($id, $taxonomy, $_POST); $updated = wp_update_term($id, $taxonomy, $_POST);
if ( $updated && !is_wp_error($updated) ) { if ( $updated && !is_wp_error($updated) ) {
$tag = get_term( $updated['term_id'], $taxonomy ); $tag = get_term( $updated['term_id'], $taxonomy );
if ( !$tag || is_wp_error( $tag ) ) if ( !$tag || is_wp_error( $tag ) ) {
die( __('Tag not updated.') ); if ( is_wp_error($tag) && $tag->get_error_message() )
die( $tag->get_error_message() );
die( __('Item not updated.') );
}
echo _tag_row($tag, 0, '', $taxonomy); echo _tag_row($tag, 0, $taxonomy);
} else { } else {
die( __('Tag not updated.') ); if ( is_wp_error($updated) && $updated->get_error_message() )
die( $updated->get_error_message() );
die( __('Item not updated.') );
} }
break; break;