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

Rename get_edit_term_url() to get_edit_term_link() for consistency. See #9702 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15801 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-10-14 08:47:41 +00:00
parent 76ffe532d4
commit 605476f2d0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/default-list-tables.php
View File

@ -1654,7 +1654,7 @@ class WP_Terms_Table extends WP_List_Table {
$pad = str_repeat( '— ', max( 0, $this->level ) ); $pad = str_repeat( '— ', max( 0, $this->level ) );
$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag ); $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
$qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' ); $qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
$edit_link = get_edit_term_url( $tag->term_id, $taxonomy, $post_type ); $edit_link = get_edit_term_link( $tag->term_id, $taxonomy, $post_type );
$out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />'; $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';

8
wp-includes/link-template.php
View File

@ -653,7 +653,7 @@ function get_tag_feed_link($tag_id, $feed = '') {
* @return string * @return string
*/ */
function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) { function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) {
return apply_filters( 'get_edit_tag_link', get_edit_term_url( $tag_id, $taxonomy ) ); return apply_filters( 'get_edit_tag_link', get_edit_term_link( $tag_id, $taxonomy ) );
} }
/** /**
@ -682,7 +682,7 @@ function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
* @param string $object_type The object type * @param string $object_type The object type
* @return string * @return string
*/ */
function get_edit_term_url( $term_id, $taxonomy, $object_type = '' ) { function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) {
$tax = get_taxonomy( $taxonomy ); $tax = get_taxonomy( $taxonomy );
if ( !current_user_can( $tax->cap->edit_terms ) ) if ( !current_user_can( $tax->cap->edit_terms ) )
return; return;
@ -700,7 +700,7 @@ function get_edit_term_url( $term_id, $taxonomy, $object_type = '' ) {
$location = add_query_arg( $args, admin_url( 'edit-tags.php' ) ); $location = add_query_arg( $args, admin_url( 'edit-tags.php' ) );
return apply_filters( 'get_edit_term_url', $location, $term_id, $taxonomy, $object_type ); return apply_filters( 'get_edit_term_link', $location, $term_id, $taxonomy, $object_type );
} }
/** /**
@ -727,7 +727,7 @@ function edit_term_link( $link = '', $before = '', $after = '', $term = null, $e
if ( empty( $link ) ) if ( empty( $link ) )
$link = __('Edit This'); $link = __('Edit This');
$link = '<a href="' . get_edit_term_url( $term->term_id, $term->taxonomy ) . '" title="' . $link . '">' . $link . '</a>'; $link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '" title="' . $link . '">' . $link . '</a>';
$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after; $link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
if ( $echo ) if ( $echo )