diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 3db5c289c8..d872123e61 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -907,21 +907,22 @@ function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) { * Retrieve edit term url. * * @since 3.1.0 + * @since 4.5.0 The `$taxonomy` argument was made optional. * * @param int $term_id Term ID. - * @param string $taxonomy Taxonomy. - * @param string $object_type The object type. Used to highlight the proper post type menu on the linked page. + * @param string $taxonomy Optional. Taxonomy. Defaults to the taxonomy of the term identified by `$term_id`. + * @param string $object_type Optional. The object type. Used to highlight the proper post type menu on the linked page. * Defaults to the first object_type associated with the taxonomy. * @return string|null The edit term link URL for the given term, or null on failure. */ -function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) { - $tax = get_taxonomy( $taxonomy ); - if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) { +function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) { + $term = get_term( $term_id, $taxonomy ); + if ( ! $term || is_wp_error( $term ) ) { return; } - $term = get_term( $term_id, $taxonomy ); - if ( ! $term || is_wp_error( $term ) ) { + $tax = get_taxonomy( $term->taxonomy ); + if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) { return; } diff --git a/wp-includes/version.php b/wp-includes/version.php index d8dc638801..4b2a3672f2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-36645'; +$wp_version = '4.5-alpha-36646'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.