golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Quick edit taxonomy label. props scribu, keighl, fixes #12796 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-10 11:54:33 +00:00
parent ab16d12c2c
commit 5e36f9f821
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/template.php
View File

@ -63,7 +63,7 @@ function inline_edit_term_row($type, $taxonomy) {
<p class="inline-edit-save submit">
<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
<?php $update_text = ( 'post_tag' == $taxonomy ) ? __( 'Update Tag' ) : __( 'Update Category' ); ?>
<?php $update_text = sprintf( __('Update %s'), $tax->singular_label ); ?>
<a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
<span class="error" style="display:none;"></span>

4
wp-includes/post.php
View File

@ -674,11 +674,11 @@ function get_post_stati( $args = array(), $output = 'names', $operator = 'or' )
function is_post_type_hierarchical( $post = false ) {
if ( is_string($post) && $is_post_type = get_post_type_object($post) )
return $is_post_type->hierarchical;
$ptype = get_post( $post );
if ( $ptype && $is_post_type = get_post_type_object($ptype->post_type) )
return $is_post_type->hierarchical;
return false;
}